From d4ba3e3dc60f77ed354e8615f7fbca7e14999d59 Mon Sep 17 00:00:00 2001
From: afwerar <1296468573@qq.com>
Date: Mon, 27 Jun 2022 15:44:14 +0800
Subject: [PATCH] test: add win newest test

---
 source/libs/parser/src/parUtil.c |   5 ++
 tests/script/test-all.bat        |  26 +++++---
 tests/system-test/fulltest.bat   | 102 -------------------------------
 tests/system-test/test-all.bat   |  27 +++++---
 4 files changed, 41 insertions(+), 119 deletions(-)
 delete mode 100644 tests/system-test/fulltest.bat

diff --git a/source/libs/parser/src/parUtil.c b/source/libs/parser/src/parUtil.c
index c4f4624355..202dd96581 100644
--- a/source/libs/parser/src/parUtil.c
+++ b/source/libs/parser/src/parUtil.c
@@ -337,7 +337,11 @@ int32_t trimString(const char* src, int32_t len, char* dst, int32_t dlen) {
 static bool isValidateTag(char* input) {
   if (!input) return false;
   for (size_t i = 0; i < strlen(input); ++i) {
+  #ifdef WINDOWS
+    if (input[i] < 0x20 || input[i] > 0x7E) return false;
+  #else
     if (isprint(input[i]) == 0) return false;
+  #endif
   }
   return true;
 }
@@ -377,6 +381,7 @@ int32_t parseJsontoTagData(const char* json, SArray* pTagVals, STag** ppTag, SMs
 
     char* jsonKey = item->string;
     if (!isValidateTag(jsonKey)) {
+      fprintf(stdout,"%s(%d) %s %08" PRId64 "\n", __FILE__, __LINE__,__func__,taosGetSelfPthreadId());fflush(stdout);
       retCode = buildSyntaxErrMsg(pMsgBuf, "json key not validate", jsonKey);
       goto end;
     }
diff --git a/tests/script/test-all.bat b/tests/script/test-all.bat
index 7a1a4bc7fa..81c1f21c04 100644
--- a/tests/script/test-all.bat
+++ b/tests/script/test-all.bat
@@ -11,14 +11,17 @@ if not "%2" == "" (
 )
 for /F "usebackq tokens=*" %%i in (!caseFile!) do (
     set line=%%i
-    if "!line:~,9!" == "./test.sh" (
-        set /a a+=1
-        echo !a! Processing %%i
-        call :GetTimeSeconds !time!
-        set time1=!_timeTemp!
-        echo Start at !time!
-        call !line:./test.sh=wtest.bat! > result_!a!.txt 2>error_!a!.txt
-        if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. )
+    call :CheckSkipCase %%i
+    if !skipCase! == false (
+        if "!line:~,9!" == "./test.sh" (
+            set /a a+=1
+            echo !a! Processing %%i
+            call :GetTimeSeconds !time!
+            set time1=!_timeTemp!
+            echo Start at !time!
+            call !line:./test.sh=wtest.bat! > result_!a!.txt 2>error_!a!.txt
+            if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. )
+        )
     )
 )
 exit !exitNum!
@@ -56,3 +59,10 @@ for %%a in (%tt%) do (
 )
 set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
 goto :eof
+
+:CheckSkipCase
+set skipCase=false
+if "%*" == "./test.sh -f tsim/query/scalarFunction.sim" ( set skipCase=true )
+if "%*" == "./test.sh -f tsim/stream/distributeInterval0.sim" ( set skipCase=true )
+if "%*" == "./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim" ( set skipCase=true )
+:goto eof
\ No newline at end of file
diff --git a/tests/system-test/fulltest.bat b/tests/system-test/fulltest.bat
deleted file mode 100644
index 59ddd3fb7d..0000000000
--- a/tests/system-test/fulltest.bat
+++ /dev/null
@@ -1,102 +0,0 @@
-
-python3 .\test.py -f 0-others\taosShell.py
-python3 .\test.py -f 0-others\taosShellError.py
-python3 .\test.py -f 0-others\taosShellNetChk.py
-python3 .\test.py -f 0-others\telemetry.py
-python3 .\test.py -f 0-others\taosdMonitor.py
-python3 .\test.py -f 0-others\udfTest.py
-python3 .\test.py -f 0-others\udf_create.py
-python3 .\test.py -f 0-others\udf_restart_taosd.py
-python3 .\test.py -f 0-others\cachelast.py
-
-python3 .\test.py -f 0-others\user_control.py
-python3 .\test.py -f 0-others\fsync.py
-
-python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
-python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
-python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
-@REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py
-python3 .\test.py -f 1-insert\alter_stable.py
-python3 .\test.py -f 1-insert\alter_table.py
-python3 .\test.py -f 2-query\between.py
-python3 .\test.py -f 2-query\distinct.py
-python3 .\test.py -f 2-query\varchar.py
-python3 .\test.py -f 2-query\ltrim.py
-python3 .\test.py -f 2-query\rtrim.py
-python3 .\test.py -f 2-query\length.py
-python3 .\test.py -f 2-query\char_length.py
-python3 .\test.py -f 2-query\upper.py
-python3 .\test.py -f 2-query\lower.py
-python3 .\test.py -f 2-query\join.py
-python3 .\test.py -f 2-query\join2.py
-python3 .\test.py -f 2-query\cast.py
-python3 .\test.py -f 2-query\union.py
-python3 .\test.py -f 2-query\union1.py
-python3 .\test.py -f 2-query\concat.py
-python3 .\test.py -f 2-query\concat2.py
-python3 .\test.py -f 2-query\concat_ws.py
-python3 .\test.py -f 2-query\concat_ws2.py
-python3 .\test.py -f 2-query\check_tsdb.py
-python3 .\test.py -f 2-query\spread.py
-python3 .\test.py -f 2-query\hyperloglog.py
-
-python3 .\test.py -f 2-query\timezone.py
-python3 .\test.py -f 2-query\Now.py
-python3 .\test.py -f 2-query\Today.py
-python3 .\test.py -f 2-query\max.py
-python3 .\test.py -f 2-query\min.py
-python3 .\test.py -f 2-query\count.py
-python3 .\test.py -f 2-query\last.py
-python3 .\test.py -f 2-query\first.py
-python3 .\test.py -f 2-query\To_iso8601.py
-python3 .\test.py -f 2-query\To_unixtimestamp.py
-python3 .\test.py -f 2-query\timetruncate.py
-python3 .\test.py -f 2-query\diff.py
-python3 .\test.py -f 2-query\Timediff.py
-
-python3 .\test.py -f 2-query\top.py
-python3 .\test.py -f 2-query\bottom.py
-python3 .\test.py -f 2-query\percentile.py
-python3 .\test.py -f 2-query\apercentile.py
-python3 .\test.py -f 2-query\abs.py
-python3 .\test.py -f 2-query\ceil.py
-python3 .\test.py -f 2-query\floor.py
-python3 .\test.py -f 2-query\round.py
-python3 .\test.py -f 2-query\log.py
-python3 .\test.py -f 2-query\pow.py
-python3 .\test.py -f 2-query\sqrt.py
-python3 .\test.py -f 2-query\sin.py
-python3 .\test.py -f 2-query\cos.py
-python3 .\test.py -f 2-query\tan.py
-python3 .\test.py -f 2-query\arcsin.py
-python3 .\test.py -f 2-query\arccos.py
-python3 .\test.py -f 2-query\arctan.py
-python3 .\test.py -f 2-query\query_cols_tags_and_or.py
-@REM # python3 .\test.py -f 2-query\nestedQuery.py
-@REM # TD-15983 subquery output duplicate name column. 
-@REM # Please Xiangyang Guo modify the following script
-@REM # python3 .\test.py -f 2-query\nestedQuery_str.py
-
-python3 .\test.py -f 2-query\avg.py
-python3 .\test.py -f 2-query\elapsed.py
-python3 .\test.py -f 2-query\csum.py
-python3 .\test.py -f 2-query\mavg.py
-python3 .\test.py -f 2-query\diff.py
-python3 .\test.py -f 2-query\sample.py
-python3 .\test.py -f 2-query\function_diff.py
-python3 .\test.py -f 2-query\unique.py
-python3 .\test.py -f 2-query\stateduration.py
-python3 .\test.py -f 2-query\function_stateduration.py
-python3 .\test.py -f 2-query\statecount.py
-
-python3 .\test.py -f 7-tmq\basic5.py
-python3 .\test.py -f 7-tmq\subscribeDb.py
-python3 .\test.py -f 7-tmq\subscribeDb0.py
-python3 .\test.py -f 7-tmq\subscribeDb1.py
-python3 .\test.py -f 7-tmq\subscribeStb.py
-python3 .\test.py -f 7-tmq\subscribeStb0.py
-python3 .\test.py -f 7-tmq\subscribeStb1.py
-python3 .\test.py -f 7-tmq\subscribeStb2.py
-python3 .\test.py -f 7-tmq\subscribeStb3.py
-python3 .\test.py -f 7-tmq\subscribeStb4.py
-python3 .\test.py -f 7-tmq\db.py
\ No newline at end of file
diff --git a/tests/system-test/test-all.bat b/tests/system-test/test-all.bat
index adc9e0ce28..d4032cbc0d 100644
--- a/tests/system-test/test-all.bat
+++ b/tests/system-test/test-all.bat
@@ -6,19 +6,23 @@ if "%1" == "full" (
     echo Windows Taosd Full Test
     set /a exitNum=0
     del /Q /F failed.txt
-    set caseFile="fulltest.bat"
+    set caseFile="fulltest.sh"
     if not "%2" == "" (
         set caseFile="%2"
     )
     for /F "usebackq tokens=*" %%i in (!caseFile!) do (
-        for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
-            set /a a+=1
-            echo !a! Processing %%i
-            call :GetTimeSeconds !time!
-            set time1=!_timeTemp!
-            echo Start at !time!
-            call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
-            if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. )
+        call :CheckSkipCase %%i
+        if !skipCase! == false (
+            set line=%%i
+            if "!line:~,7!" == "python3" (
+                set /a a+=1
+                echo !a! Processing %%i
+                call :GetTimeSeconds !time!
+                set time1=!_timeTemp!
+                echo Start at !time!
+                call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
+                if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 && echo %%i >>failed.txt ) else ( call :colorEcho 0a "Success" &echo. )
+            )
         )
     )
     exit !exitNum!
@@ -83,3 +87,8 @@ for %%a in (%tt%) do (
 )
 set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
 goto :eof
+
+:CheckSkipCase
+set skipCase=false
+if "%*" == "python3 ./test.py -f 1-insert/insertWithMoreVgroup.py" ( set skipCase=true )
+:goto eof
\ No newline at end of file