diff --git a/tests/army/win-test-file b/tests/army/win-test-file new file mode 100644 index 0000000000..b4f5c9312d --- /dev/null +++ b/tests/army/win-test-file @@ -0,0 +1,29 @@ +python3 ./test.py -f multi-level/mlevel_basic.py -N 3 -L 3 -D 2 +python3 ./test.py -f db-encrypt/basic.py +python3 ./test.py -f s3/s3Basic.py -N 3 +python3 ./test.py -f cluster/snapshot.py -N 3 -L 3 -D 2 +python3 ./test.py -f query/function/test_func_elapsed.py +python3 ./test.py -f query/function/concat.py +python3 ./test.py -f query/function/cast.py +python3 ./test.py -f query/test_join.py +python3 ./test.py -f query/test_compare.py +python3 ./test.py -f insert/test_column_tag_boundary.py +python3 ./test.py -f query/fill/fill_desc.py -N 3 -L 3 -D 2 +python3 ./test.py -f query/fill/fill_null.py +python3 ./test.py -f cluster/incSnapshot.py -N 3 +python3 ./test.py -f query/query_basic.py -N 3 +python3 ./test.py -f query/accuracy/test_query_accuracy.py +python3 ./test.py -f insert/insert_basic.py -N 3 +python3 ./test.py -f cluster/splitVgroupByLearner.py -N 3 +python3 ./test.py -f authorith/authBasic.py -N 3 +python3 ./test.py -f cmdline/fullopt.py +python3 ./test.py -f query/show.py -N 3 +python3 ./test.py -f alter/alterConfig.py -N 3 +python3 ./test.py -f query/subquery/subqueryBugs.py -N 3 +python3 ./test.py -f storage/oneStageComp.py -N 3 -L 3 -D 1 +python3 ./test.py -f storage/compressBasic.py -N 3 +python3 ./test.py -f grant/grantBugs.py -N 3 +python3 ./test.py -f query/queryBugs.py -N 3 +python3 ./test.py -f tmq/tmqBugs.py -N 3 +python3 ./test.py -f query/fill/fill_compare_asc_desc.py +python3 ./test.py -f query/last/test_last.py diff --git a/tests/parallel_test/split_case.sh b/tests/parallel_test/split_case.sh index e237cbf984..7a53fc6abd 100755 --- a/tests/parallel_test/split_case.sh +++ b/tests/parallel_test/split_case.sh @@ -5,20 +5,34 @@ parm_path=$(pwd ${parm_path}) echo "execute path:${parm_path}" cd ${parm_path} cp cases.task ${case_file} -# comment udf and stream case in windows +# comment udf and stream and sma case in windows sed -i '/udf/d' ${case_file} sed -i '/Udf/d' ${case_file} sed -i '/stream/d' ${case_file} sed -i '/^$/d' ${case_file} sed -i '$a\%%FINISHED%%' ${case_file} +#unsupported case:sma +sed -i '/tsim\/sync\/vnodesnapshot-rsma-test.sim/d' ${case_file} +sed -i '/tsim\/sma/d' ${case_file} +sed -i '/tsim\/tagindex\/sma_and_tag_index.sim/d' ${case_file} +#unsupported case:to_char +sed -i '/tsim\/query\/sort-pre-cols.sim/d' ${case_file} +sed -i '/2-query\/nestedQueryInterval.py/d' ${case_file} +#unsupported case:stream +sed -i '/database_pre_suf/d' ${case_file} + utest="unit-test" tsimtest="script" systest="system-test" devtest="develop-test" doctest="docs-examples-test" -rm -rf win-${utest}.log win-${tsimtest}.log win-${systest}.log win-${devtest}.log win-${doctest}.log -rm -rf ${parm_path}/../${utest}/win-test-file ${parm_path}/../${tsimtest}/win-test-file ${parm_path}/../${systest}/win-test-file ${parm_path}/../${devtest}/win-test-file +armytest="army" + +rm -rf win-${utest}.log win-${tsimtest}.log win-${systest}.log win-${devtest}.log win-${doctest}.log win-${armytest}.log + +rm -rf ${parm_path}/../${utest}/win-test-file ${parm_path}/../${tsimtest}/win-test-file ${parm_path}/../${systest}/win-test-file ${parm_path}/../${devtest}/win-test-file ${parm_path}/../${doctest}/win-test-file ${parm_path}/../${armytest}/win-test-file + while read -r line do echo "$line"|grep -q "^#" @@ -44,6 +58,15 @@ do fi continue fi + if [[ "${exec_dir}" == "${armytest}" ]]; then + if [[ "${case_cmd}" =~ "pytest.sh" ]]; then + case_cmd=$(echo "$case_cmd"|cut -d ' ' -f 2-) + echo "${case_cmd}" >> win-${armytest}.log + else + echo "${case_cmd}" >> win-${armytest}.log + fi + continue + fi if [[ "${exec_dir}" == "${devtest}" ]]; then echo ${case_cmd} >> win-${devtest}.log continue @@ -57,6 +80,7 @@ mv win-${utest}.log ${parm_path}/../${utest}/win-test-file mv win-${tsimtest}.log ${parm_path}/../${tsimtest}/win-test-file mv win-${systest}.log ${parm_path}/../${systest}/win-test-file mv win-${devtest}.log ${parm_path}/../${devtest}/win-test-file - +mv win-${armytest}.log ${parm_path}/../${armytest}/win-test-file +mv win-${doctest}.log ${parm_path}/../${armytest}/win-test-file rm -rf ${case_file} diff --git a/tests/script/win-test-file b/tests/script/win-test-file index 8c96722c9f..ff69e91967 100644 --- a/tests/script/win-test-file +++ b/tests/script/win-test-file @@ -200,7 +200,6 @@ ./test.sh -f tsim/query/unionall_as_table.sim ./test.sh -f tsim/query/multi_order_by.sim ./test.sh -f tsim/query/sys_tbname.sim -./test.sh -f tsim/query/sort-pre-cols.sim ./test.sh -f tsim/query/groupby.sim ./test.sh -f tsim/query/groupby_distinct.sim ./test.sh -f tsim/query/event.sim @@ -289,12 +288,6 @@ ./test.sh -f tsim/stable/tag_rename.sim ./test.sh -f tsim/stable/values.sim ./test.sh -f tsim/stable/vnode3.sim -./test.sh -f tsim/sma/drop_sma.sim -./test.sh -f tsim/sma/sma_leak.sim -./test.sh -f tsim/sma/tsmaCreateInsertQuery.sim -./test.sh -f tsim/sma/rsmaCreateInsertQuery.sim -./test.sh -f tsim/sma/rsmaCreateInsertQueryDelete.sim -./test.sh -f tsim/sync/vnodesnapshot-rsma-test.sim ./test.sh -f tsim/valgrind/checkError1.sim ./test.sh -f tsim/valgrind/checkError2.sim ./test.sh -f tsim/valgrind/checkError3.sim @@ -406,7 +399,6 @@ ./test.sh -f tsim/tag/tbNameIn.sim ./test.sh -f tmp/monitor.sim ./test.sh -f tsim/tagindex/add_index.sim -./test.sh -f tsim/tagindex/sma_and_tag_index.sim ./test.sh -f tsim/tagindex/indexOverflow.sim ./test.sh -f tsim/view/view.sim ./test.sh -f tsim/query/cache_last.sim diff --git a/tests/system-test/win-test-file b/tests/system-test/win-test-file index 41eb28e071..7f007f42d9 100644 --- a/tests/system-test/win-test-file +++ b/tests/system-test/win-test-file @@ -104,7 +104,6 @@ python3 ./test.py -f 2-query/insert_null_none.py -R python3 ./test.py -f 2-query/insert_null_none.py -Q 2 python3 ./test.py -f 2-query/insert_null_none.py -Q 3 python3 ./test.py -f 2-query/insert_null_none.py -Q 4 -python3 ./test.py -f 1-insert/database_pre_suf.py python3 ./test.py -f 2-query/concat.py -Q 3 python3 ./test.py -f 2-query/out_of_order.py -Q 2 python3 ./test.py -f 2-query/out_of_order.py -Q 4 @@ -572,7 +571,6 @@ python3 ./test.py -f 2-query/join2.py python3 ./test.py -f 2-query/union1.py python3 ./test.py -f 2-query/concat2.py python3 ./test.py -f 2-query/json_tag.py -python3 ./test.py -f 2-query/nestedQueryInterval.py python3 ./test.py -f 2-query/systable_func.py python3 ./test.py -f 2-query/test_ts4382.py python3 ./test.py -f 2-query/test_ts4403.py @@ -687,7 +685,6 @@ python3 ./test.py -f 2-query/arctan.py -Q 2 python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q 2 python3 ./test.py -f 2-query/interp.py -Q 2 python3 ./test.py -f 2-query/fill.py -Q 2 -python3 ./test.py -f 2-query/nestedQueryInterval.py -Q 2 python3 ./test.py -f 2-query/stablity.py -Q 2 python3 ./test.py -f 2-query/stablity_1.py -Q 2 python3 ./test.py -f 2-query/avg.py -Q 2 @@ -783,7 +780,6 @@ python3 ./test.py -f 2-query/arcsin.py -Q 3 python3 ./test.py -f 2-query/arccos.py -Q 3 python3 ./test.py -f 2-query/arctan.py -Q 3 python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q 3 -python3 ./test.py -f 2-query/nestedQueryInterval.py -Q 3 python3 ./test.py -f 2-query/stablity.py -Q 3 python3 ./test.py -f 2-query/stablity_1.py -Q 3 python3 ./test.py -f 2-query/avg.py -Q 3 @@ -881,7 +877,6 @@ python3 ./test.py -f 2-query/arcsin.py -Q 4 python3 ./test.py -f 2-query/arccos.py -Q 4 python3 ./test.py -f 2-query/arctan.py -Q 4 python3 ./test.py -f 2-query/query_cols_tags_and_or.py -Q 4 -python3 ./test.py -f 2-query/nestedQueryInterval.py -Q 4 python3 ./test.py -f 2-query/stablity.py -Q 4 python3 ./test.py -f 2-query/stablity_1.py -Q 4 python3 ./test.py -f 2-query/avg.py -Q 4