scripts

tests/script/basicSuite.sim

@@ -9,7 +9,6 @@ run general/import/basic.sim
 run general/import/commit.sim
 run general/insert/query_file_memory.sim
 run general/parser/binary_escapeCharacter.sim
-run general/parser/columnValue_bigint.sim
 run general/parser/select_from_cache_disk.sim
 run general/table/autocreate.sim
 run general/table/column_name.sim
@@ -18,5 +17,5 @@ run general/table/vgroup.sim
 run general/user/basic1.sim
 run general/user/pass_alter.sim
 run general/vector/single.sim
-run general/connection/connection.sim
+#run general/connection/connection.sim
 run general/user/authority.sim

tests/script/general/parser/alter.sim

@@ -238,3 +238,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/alter_stable.sim

@@ -39,4 +39,4 @@ sql alter table tb1 set tag len = 379
 # test end   
 sql drop database $db
 
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/auto_create_tb.sim

@@ -1,6 +1,4 @@
 system sh/stop_dnodes.sh
-
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 0
 system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
@@ -305,3 +303,5 @@ sql select * from tu
 if $rows != 2 then
     return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/auto_create_tb_drop_tb.sim

@@ -1,5 +1,4 @@
 system sh/stop_dnodes.sh
-
 system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c walLevel -v 1
 system sh/cfg.sh -n dnode1 -c ctime -v 30
@@ -81,3 +80,5 @@ while $x < 100
   $x = $x + 1
   print loop $x
 endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/binary_escapeCharacter.sim

@@ -95,9 +95,4 @@ if $data41 != @udp005@ then
 endi
 
 
-
-
-
-
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/bug.sim

@@ -42,4 +42,3 @@ sql select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st
 system_content curl -H 'Authorization: Taosd /KfeAzX/f9na8qdtNZmtONryp201ma04bEl8LcvLUd7a8qdtNZmtONryp201ma04' -d 'select st1.ts, st1.f1, st2.f2 from db.st1, db.st2 where st1.t1=st2.t2 and st1.ts=st2.ts'  127.0.0.1:6020/restful/sql
 
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-

tests/script/general/parser/col_arithmetic_operation.sim

@@ -90,3 +90,5 @@ endi
 #### illegal operations
 sql_error select max(c2*2) from $tb
 sql_error select max(c1-c2) from $tb
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/columnValue.sim

@@ -22,15 +22,5 @@ run general/parser/columnValue_bigint.sim
 run general/parser/columnValue_float.sim
 run general/parser/columnValue_double.sim
 
-
-
-
-
-
-
-
-
-
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
 

tests/script/general/parser/commit.sim

@@ -107,3 +107,5 @@ while $loop <= $loops
   endi
   $loop = $loop + 1
 endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/create_db.sim

@@ -188,3 +188,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/create_mt.sim

@@ -258,3 +258,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/create_tb.sim

@@ -188,3 +188,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/dbtbnameValidate.sim

@@ -127,5 +127,4 @@ if $rows != 7 then
   return -1
 endi
 
-
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/fill.sim

@@ -849,3 +849,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/fill_stb.sim

@@ -430,3 +430,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/first_last.sim

@@ -83,3 +83,4 @@ sleep 3000
 
 run general/parser/first_last_query.sim
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/groupby.sim

@@ -406,4 +406,6 @@ endi
 
 if $data97 != @group_tb0@ then
   return -1
-endi
+endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/import_commit1.sim

@@ -53,3 +53,4 @@ if $data00 != $res then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/import_commit2.sim

@@ -52,3 +52,4 @@ if $data00 != $res then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/import_commit3.sim

@@ -59,3 +59,4 @@ if $data00 != $res then
   return -1
 endi
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/import_file.sim

@@ -34,4 +34,6 @@ endi
 
 
 #system rm -f $inFileName     # invalid shell
-system rm -f ~/data.csv
+system rm -f ~/data.csv
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/insert_tb.sim

@@ -233,3 +233,4 @@ endi
 #endi
 
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/interp.sim

@@ -65,3 +65,5 @@ system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run general/parser/interp_test.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/join.sim

@@ -444,3 +444,5 @@ sql insert into um1 using m2 tags(1) values(1000001, 10)(2000000, 20);
 sql insert into um2 using m2 tags(9) values(1000001, 10)(2000000, 20);
 
 sql_error select count(*) from m1,m2 where m1.a=m2.a and m1.ts=m2.ts;
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/join_multivnode.sim

@@ -127,4 +127,6 @@ sql select join_mt0.ts, join_mt1.t1 from join_mt0, join_mt1 where join_mt0.ts=jo
 
 sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1
 
-sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1
+sql select join_mt0.ts, join_mt1.t1, join_mt0.t1, join_mt1.tbname, join_mt0.tbname from join_mt0, join_mt1 where join_mt0.ts=join_mt1.ts and join_mt0.t1=join_mt1.t1 limit 1
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/lastrow.sim

@@ -68,3 +68,5 @@ sql connect
 sleep 3000
 
 run general/parser/lastrow_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/limit.sim

@@ -69,3 +69,5 @@ sleep 3000
 
 run general/parser/limit_tb.sim
 run general/parser/limit_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/limit1.sim

@@ -67,3 +67,5 @@ print ================== server restart completed
 
 run general/parser/limit1_tb.sim
 run general/parser/limit1_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/limit1_tblocks100.sim

@@ -67,3 +67,5 @@ print ================== server restart completed
 
 run general/parser/limit1_tb.sim
 run general/parser/limit1_stb.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/limit2.sim

@@ -74,3 +74,5 @@ system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run general/parser/limit2_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/mixed_blocks.sim

@@ -142,3 +142,5 @@ endi
 if $data03 != 319 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/nchar.sim

@@ -310,3 +310,5 @@ endi
 # if $rows != 0 then 
 #   return -1
 # endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/null_char.sim

@@ -488,3 +488,4 @@ sql_error alter table st51 set tag tag_tinyint = abc379
 #sql drop database $db
 
 
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/projection_limit_offset.sim

@@ -375,4 +375,4 @@ sql_error select 'abc';
 #=============================tbase-1205
 sql select count(*) from tm1 where ts<now and ts>= now -1d interval(1h) fill(NULL);
 
-
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/repeatAlter.sim

@@ -5,3 +5,5 @@ while $i <= $loops
   run general/parser/alter.sim
   $i = $i + 1
 endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/repeatStream.sim

@@ -5,3 +5,5 @@ while $i <= $repeats
   run general/parser/stream.sim
   $i = $i + 1
 endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/selectResNum.sim

@@ -182,3 +182,5 @@ while $loop <= $loops
   endw
   $loop = $loop + 1
 endw
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/select_across_vnodes.sim

@@ -80,3 +80,5 @@ sql show databases
 if $rows != 0 then 
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/select_from_cache_disk.sim

@@ -68,3 +68,5 @@ endi
 if $data12 != 1 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/select_with_tags.sim

@@ -838,3 +838,5 @@ sql_error select first(c1), count(*), t2, t1, tbname from select_tags_mt0 group
 #sql select first(ts), tbname from select_tags_mt0 group by tbname;
 #sql select count(c1) from select_tags_mt0 where c1=99 group by tbname;
 #sql select count(*),tbname from select_tags_mt0 group by tbname
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/set_tag_vals.sim

@@ -225,3 +225,5 @@ endi
 if $data04 != NULL then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/single_row_in_tb.sim

@@ -36,3 +36,5 @@ system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run general/parser/single_row_in_tb_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/slimit.sim

@@ -105,3 +105,5 @@ sql connect
 sleep 3000
 
 run general/parser/slimit_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/slimit1.sim

@@ -64,3 +64,5 @@ sql connect
 sleep 3000
 
 run general/parser/slimit1_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/slimit_alter_tags.sim

@@ -255,3 +255,5 @@ endi
 #if $rows != 0 then 
 #  return -1
 #endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/stream.sim

@@ -220,3 +220,5 @@ sql create database $db
 sql use $db
 sql create table stb (ts timestamp, c1 int) tags(t1 int)
 sql create table tb1 using stb tags(1)
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/stream_on_sys.sim

@@ -58,3 +58,5 @@ sql select * from iostrm
 if $rows <= 0 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/tags_dynamically_specifiy.sim

@@ -55,4 +55,6 @@ endi
 #if $data06 != 100.90000 then
 #  print "expect: 100.90000, act: $data06"
 #  return -1
-#endi
+#endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/tbnameIn.sim

@@ -73,3 +73,5 @@ system sh/exec.sh -n dnode1 -s start
 print ================== server restart completed
 
 run general/parser/tbnameIn_query.sim
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/general/parser/testSuite.sim

@@ -98,3 +98,8 @@ sleep 2000
 run general/parser/select_with_tags.sim
 sleep 2000
 run general/parser/groupby.sim
+
+sleep 2000
+run general/parser/binary_escapeCharacter.sim
+sleep 2000
+#run general/parser/bug.sim

tests/script/general/parser/where.sim

@@ -272,3 +272,5 @@ sql select * from tb_where_NULL where c2 <> "nUll"
 if $rows != 2 then
   return -1
 endi
+
+system sh/exec.sh -n dnode1 -s stop -x SIGINT

tests/script/jenkins/basic.txt

@@ -41,6 +41,8 @@ cd ../../../debug; make
 ./test.sh -f general/compute/sum.sim
 ./test.sh -f general/compute/top.sim
 
+#jeff ./test.sh -f general/connection/connection.sim
+
 ./test.sh -f general/db/basic.sim
 ./test.sh -f general/db/basic1.sim
 ./test.sh -f general/db/basic2.sim
@@ -97,61 +99,54 @@ cd ../../../debug; make
 #unsupport ./test.sh -f general/parser/alter.sim
 #unsupport ./test.sh -f general/parser/alter1.sim
 #unsupport ./test.sh -f general/parser/alter_stable.sim
-#rpc error? ./test.sh -f general/parser/auto_create_tb.sim
-# ./test.sh -f general/parser/auto_create_tb_drop_tb.sim
-./test.sh -f general/parser/binary_escapeCharacter.sim
-#./test.sh -f general/parser/bug.sim
+./test.sh -f general/parser/auto_create_tb.sim
+#slguan ./test.sh -f general/parser/auto_create_tb_drop_tb.sim
 ./test.sh -f general/parser/col_arithmetic_operation.sim
-./test.sh -f general/parser/columnValue_bigint.sim
-./test.sh -f general/parser/columnValue_bool.sim
-./test.sh -f general/parser/columnValue_double.sim
-./test.sh -f general/parser/columnValue_float.sim
-./test.sh -f general/parser/columnValue_int.sim
-# ./test.sh -f general/parser/col_arithmetic_operation.sim
 ./test.sh -f general/parser/columnValue.sim
 ./test.sh -f general/parser/commit.sim
 # ./test.sh -f general/parser/create_db.sim
 # ./test.sh -f general/parser/create_mt.sim
 # ./test.sh -f general/parser/create_tb.sim
 # ./test.sh -f general/parser/dbtbnameValidate.sim
-# ./test.sh -f general/parser/fill.sim
-# ./test.sh -f general/parser/fill_stb.sim
-# ./test.sh -f general/parser/first_last.sim
 ./test.sh -f general/parser/import_commit1.sim
 ./test.sh -f general/parser/import_commit2.sim
 ./test.sh -f general/parser/import_commit3.sim
-# ./test.sh -f general/parser/import_file.sim
 # ./test.sh -f general/parser/insert_tb.sim
+# ./test.sh -f general/parser/first_last.sim
+# ./test.sh -f general/parser/import_file.sim
+# ./test.sh -f general/parser/lastrow.sim
+# ./test.sh -f general/parser/nchar.sim
+# ./test.sh -f general/parser/null_char.sim
+# ./test.sh -f general/parser/single_row_in_tb.sim
+./test.sh -f general/parser/select_from_cache_disk.sim
+# ./test.sh -f general/parser/limit.sim
+# ./test.sh -f general/parser/fill.sim
+# ./test.sh -f general/parser/fill_stb.sim
 # ./test.sh -f general/parser/tags_dynamically_specifiy.sim
 # ./test.sh -f general/parser/interp.sim
-# ./test.sh -f general/parser/lastrow.sim
-# ./test.sh -f general/parser/limit.sim
 # ./test.sh -f general/parser/limit1.sim
 # ./test.sh -f general/parser/limit1_tblocks100.sim
 # ./test.sh -f general/parser/limit2.sim
 # ./test.sh -f general/parser/mixed_blocks.sim
-# ./test.sh -f general/parser/nchar.sim
-# ./test.sh -f general/parser/null_char.sim
 # ./test.sh -f general/parser/selectResNum.sim
 # ./test.sh -f general/parser/select_across_vnodes.sim
-./test.sh -f general/parser/select_from_cache_disk.sim
 # ./test.sh -f general/parser/set_tag_vals.sim
-# ./test.sh -f general/parser/single_row_in_tb.sim
 # ./test.sh -f general/parser/slimit.sim
 ./test.sh -f general/parser/slimit1.sim
-./test.sh -f general/parser/slimit1_query.sim
-# ./test.sh -f general/parser/slimit_alter_tags.sim
-# ./test.sh -f general/parser/stream_on_sys.sim
-# ./test.sh -f general/parser/stream.sim
+#unsupport ./test.sh -f general/parser/slimit_alter_tags.sim
+#unsupport ./test.sh -f general/parser/stream_on_sys.sim
+#unsupport ./test.sh -f general/parser/stream.sim
 # ./test.sh -f general/parser/tbnameIn.sim
 # ./test.sh -f general/parser/where.sim
 # ./test.sh -f general/parser/repeatAlter.sim
-# ./test.sh -f general/parser/repeatStream.sim
+#unsupport ./test.sh -f general/parser/repeatStream.sim
 # ./test.sh -f general/parser/join.sim
 # ./test.sh -f general/parser/join_multivnode.sim
 # ./test.sh -f general/parser/projection_limit_offset.sim
 # ./test.sh -f general/parser/select_with_tags.sim
 # ./test.sh -f general/parser/groupby.sim
+./test.sh -f general/parser/binary_escapeCharacter.sim
+#./test.sh -f general/parser/bug.sim
 
 ./test.sh -f general/stable/disk.sim
 ./test.sh -f general/stable/metrics.sim