Corrections and enhancements for the new tests.

FossilOrigin-Name: 20e74c638537aa207de41a4f3c932cc05024ea9a

diff --git a/manifest b/manifest
index 4323ff299d39fc7ed0c532a22050e12713f5eaf5..e0b98e55b5188416d4a0ede086e3a66d3a2a9c0d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sone\stest\sresult\sto\sbe\scase-insensitive.
-D 2016-07-15T00:09:53.145
+C Corrections\sand\senhancements\sfor\sthe\snew\stests.
+D 2016-07-15T00:23:01.539
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -1285,7 +1285,7 @@ F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/tpch01.test 04adbf8d8300fa60a222f28d901abd76e7be6dd4
 F test/trace.test 6f676313e3ebd2a50585036d2f212a3319dd5836
 F test/trace2.test f5cb67ad3bc09e0c58e8cca78dfd0b5639259983
-F test/trace3.test 0cb672483450fd430b24bc53eaddd13b2e69ffb7
+F test/trace3.test 7d174e42aab63f528a0d04ea1ddf3b49497a9cf5
 F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
 F test/trans2.test 62bd045bfc7a1c14c5ba83ba64d21ade31583f76
 F test/trans3.test 91a100e5412b488e22a655fe423a14c26403ab94
@@ -1506,7 +1506,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 8b8c0b749a9a1daca49e7ea9351e253443bb1fc2
-R 4595806197ce86b476490cbf571f56e0
+P 5ccbeeea7d7933402f7ccb0b1c9b3038989ca746
+R 614bfc4ccb78b65b369725b4f27e97e3
 U mistachkin
-Z b642433aedf1b36843816b1e93dd1f01
+Z a476d2a0aebfb671981b15fc2ac6c121

diff --git a/manifest.uuid b/manifest.uuid
index c8129cd0859ff382f767a1f0189ea5227b094c07..22e8d585746521c36f474cbd7cd16eb4566d25ad 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5ccbeeea7d7933402f7ccb0b1c9b3038989ca746
\ No newline at end of file
+20e74c638537aa207de41a4f3c932cc05024ea9a
\ No newline at end of file

diff --git a/test/trace3.test b/test/trace3.test
index eef9198791d01f40b64363317dcb77fac1c11053..1149bea3f2355a831cf5ffa6324f22d6e2bd5a6d 100644 (file)
--- a/test/trace3.test
+++ b/test/trace3.test
@@ -87,6 +87,22 @@ do_test trace3-3.3 {
   }
   set ::stmtlist(record)
 } {/^\{-?\d+ \{SELECT a, b FROM t1 ORDER BY a;\}\}$/}
+do_test trace3-3.4 {
+  set ::stmtlist(record) {}
+  db trace_v2 trace_v2_record statement
+  execsql {
+    SELECT a, b FROM t1 ORDER BY a;
+  }
+  set ::stmtlist(record)
+} {/^\{-?\d+ \{SELECT a, b FROM t1 ORDER BY a;\}\}$/}
+do_test trace3-3.5 {
+  set ::stmtlist(record) {}
+  db trace_v2 trace_v2_record 1
+  execsql {
+    SELECT a, b FROM t1 ORDER BY a;
+  }
+  set ::stmtlist(record)
+} {/^\{-?\d+ \{SELECT a, b FROM t1 ORDER BY a;\}\}$/}
 
 do_test trace3-4.1 {
   set ::stmtlist(record) {}
@@ -96,6 +112,14 @@ do_test trace3-4.1 {
   }
   set ::stmtlist(record)
 } {/^\{-?\d+ -?\d+\}$/}
+do_test trace3-4.2 {
+  set ::stmtlist(record) {}
+  db trace_v2 trace_v2_record 2
+  execsql {
+    SELECT a, b FROM t1 ORDER BY a;
+  }
+  set ::stmtlist(record)
+} {/^\{-?\d+ -?\d+\}$/}
 
 do_test trace3-5.1 {
   set ::stmtlist(record) {}
@@ -105,6 +129,14 @@ do_test trace3-5.1 {
   }
   set ::stmtlist(record)
 } "/^[string trim [string repeat {\d+ } 16]]\$/"
+do_test trace3-5.2 {
+  set ::stmtlist(record) {}
+  db trace_v2 trace_v2_record 4
+  execsql {
+    SELECT a, b FROM t1 ORDER BY a;
+  }
+  set ::stmtlist(record)
+} "/^[string trim [string repeat {\d+ } 16]]\$/"
 
 do_test trace3-6.1 {
   set ::stmtlist(record) {}
@@ -162,10 +194,14 @@ do_test trace3-8.8 {
 } {{} {SELECT a, b FROM t1 WHERE b = x'123456' ORDER BY a;}}
 
 do_test trace3-9.1 {
+  sqlite3_finalize $STMT
+} {SQLITE_OK}
+
+do_test trace3-10.1 {
   db trace_v2 ""
   db trace_v2
 } {}
-do_test trace3-9.2 {
+do_test trace3-10.2 {
   unset -nocomplain ::stmtlist
   db trace_v2 "" {statement profile row}
   execsql {
@@ -174,11 +210,20 @@ do_test trace3-9.2 {
   array get ::stmtlist
 } {}
 
-do_test trace3-10.1 {
+do_test trace3-11.1 {
   set ::stmtlist(record) {}
   db trace_v2 trace_v2_record close
   db close
   set ::stmtlist(record)
 } {/^-?\d+$/}
 
+reset_db
+
+do_test trace3-11.2 {
+  set ::stmtlist(record) {}
+  db trace_v2 trace_v2_record 8
+  db close
+  set ::stmtlist(record)
+} {/^-?\d+$/}
+
 finish_test