Merge pull request #15198 from taosdata/fix/ZhiqiangWang/TD-13063-fix-win-timestamp-convert-error

os: fix win timestamp convert error

source/os/src/osTime.c

@@ -371,7 +371,7 @@ time_t taosMktime(struct tm *timep) {
   localtime_s(&tm1, &tt);
   ss.wYear = tm1.tm_year + 1900;
   ss.wMonth = tm1.tm_mon + 1;
-  ss.wDay = tm1.tm_wday;
+  ss.wDay = tm1.tm_mday;
   ss.wHour = tm1.tm_hour;
   ss.wMinute = tm1.tm_min;
   ss.wSecond = tm1.tm_sec;
@@ -383,7 +383,7 @@ time_t taosMktime(struct tm *timep) {
 
   s.wYear = timep->tm_year + 1900;
   s.wMonth = timep->tm_mon + 1;
-  s.wDay = timep->tm_wday;
+  s.wDay = timep->tm_mday;
   s.wHour = timep->tm_hour;
   s.wMinute = timep->tm_min;
   s.wSecond = timep->tm_sec;

tests/script/test-all.bat

@@ -63,4 +63,5 @@ goto :eof
 :CheckSkipCase
 set skipCase=false
 @REM if "%*" == "./test.sh -f tsim/query/scalarFunction.sim" ( set skipCase=true )
+echo %* | grep valgrind && set skipCase=true
 :goto eof
\ No newline at end of file

tests/system-test/fulltest.sh

@@ -191,8 +191,8 @@ python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb-snapshot0.py
 python3 ./test.py -f 7-tmq/tmqUpdate-multiCtb-snapshot1.py
 #python3 ./test.py -f 7-tmq/tmqDelete-1ctb.py
 python3 ./test.py -f 7-tmq/tmqUdf.py
-python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py
-python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py
+# python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot0.py
+# python3 ./test.py -f 7-tmq/tmqUdf-multCtb-snapshot1.py
 python3 ./test.py -f 7-tmq/stbTagFilter-1ctb.py
 python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py