Fix some problems in test scripts. No code changes.

FossilOrigin-Name: 08acfc65877e207f1a62d31a14afb4add20c4c35

diff --git a/manifest b/manifest
index 1a65c31de15f6586e060860a737b08c5f5b0cfaf..ef413f44a310dbc57e2f87094c0ec23f4749723e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\sSQLITE_OMIT_COMPOUND_SELECT\sbuilds\sto\sfail.
-D 2014-01-25T12:16:53.164
+C Fix\ssome\sproblems\sin\stest\sscripts.\sNo\scode\schanges.
+D 2014-01-27T08:48:10.724
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -406,7 +406,7 @@ F test/corruptD.test b3c205fac7952b1de645ce44bb02335cd9e3e040
 F test/corruptE.test 193b4ca4e927e77c1d5f4f56203ddc998432a7ee
 F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
 F test/corruptG.test c150f156dace653c00a121ad0f5772a0568c41ba
-F test/corruptH.test 0a247f3dc8a8f3578db5f639d86c6bb4d520207f
+F test/corruptH.test 7c02f5d928499bc1b68ed4610bfc2c3f12565a35
 F test/count.test 42a251178e32f617eda33f76236a7f79825a50b5
 F test/coveridxscan.test cdb47d01acc4a634a34fd25abe85189e0d0f1e62
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
@@ -825,7 +825,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 F test/speedtest1.c 7130d2cb6db45baa553a4ab2f715116c71c2d9f4
-F test/spellfix.test 674db5da8b16d2b54939b68ccc0ac31ca53d9977
+F test/spellfix.test 61309f5efbec53603b3f86457d34a504f80abafe
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
@@ -1152,7 +1152,7 @@ F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 87bf60637e5863c54c5e2d05aaaca0835b7aace8
-R 69ab88b9bb0a730071944ebfada4d77f
+P b30db0ac3096b43d55a6da40cafc7de569082bf8
+R c469588e2189e74bc2d9214e1aed9609
 U dan
-Z d44703c5b70f5ed4164d3c8bc064c718
+Z 7abd7bfcd6752912e65623c5ee39477d

diff --git a/manifest.uuid b/manifest.uuid
index ceaaffde0a8d582077ec8003523c079e21fb02b8..081ba3ceea67a745043e4a9e2a3811b14deaf436 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b30db0ac3096b43d55a6da40cafc7de569082bf8
\ No newline at end of file
+08acfc65877e207f1a62d31a14afb4add20c4c35
\ No newline at end of file

diff --git a/test/corruptH.test b/test/corruptH.test
index 23f80632b1865312ce951f9a82a5560ce7ee2390..875a92f50485df17ed8f4fbc75de4c3d24b130f2 100644 (file)
--- a/test/corruptH.test
+++ b/test/corruptH.test
@@ -66,6 +66,7 @@ reset_db
 # Initialize the database.
 #
 do_execsql_test 2.1 {
+  PRAGMA auto_vacuum=0;
   PRAGMA page_size=1024;
 
   CREATE TABLE t1(a INTEGER PRIMARY KEY, b);

diff --git a/test/spellfix.test b/test/spellfix.test
index 3e6fdf7eec2ae3a583fe963b9f965ad4cfe8d281..21383c2d336df3a5319dcb3579bda40bcf1defd7 100644 (file)
--- a/test/spellfix.test
+++ b/test/spellfix.test
@@ -234,35 +234,37 @@ do_execsql_test 6.1.3 {
   SELECT word, distance FROM t3 WHERE rowid = 10 AND word MATCH 'kiiner';
 } {keener 300}
 
-proc trace_callback {sql} {
-  if {[string range $sql 0 2] == "-- "} {
-    lappend ::trace [string range $sql 3 end]
+ifcapable trace {
+  proc trace_callback {sql} {
+    if {[string range $sql 0 2] == "-- "} {
+      lappend ::trace [string range $sql 3 end]
+    }
+  }
+  
+  proc do_tracesql_test {tn sql {res {}}} {
+    set ::trace [list]
+    uplevel [list do_test $tn [subst -nocommands {
+      set vals [execsql {$sql}]
+      concat [set vals] [set ::trace]
+    }] [list {*}$res]]
+  }
+  
+  db trace trace_callback
+  do_tracesql_test 6.2.1 {
+    SELECT word FROM t3 WHERE rowid = 10;
+  } {keener
+    {SELECT word, rank, NULL, langid, id FROM "main"."t3_vocab" WHERE rowid=?}
+  }
+  do_tracesql_test 6.2.2 {
+    SELECT word, distance FROM t3 WHERE rowid = 10;
+  } {keener {}
+    {SELECT word, rank, NULL, langid, id FROM "main"."t3_vocab" WHERE rowid=?}
+  }
+  do_tracesql_test 6.2.3 {
+    SELECT word, distance FROM t3 WHERE rowid = 10 AND word MATCH 'kiiner';
+  } {keener 300
+    {SELECT id, word, rank, k1  FROM "main"."t3_vocab" WHERE langid=0 AND k2>=?1 AND k2<?2}
   }
-}
-
-proc do_tracesql_test {tn sql {res {}}} {
-  set ::trace [list]
-  uplevel [list do_test $tn [subst -nocommands {
-    set vals [execsql {$sql}]
-    concat [set vals] [set ::trace]
-  }] [list {*}$res]]
-}
-
-db trace trace_callback
-do_tracesql_test 6.2.1 {
-  SELECT word FROM t3 WHERE rowid = 10;
-} {keener
-  {SELECT word, rank, NULL, langid, id FROM "main"."t3_vocab" WHERE rowid=?}
-}
-do_tracesql_test 6.2.2 {
-  SELECT word, distance FROM t3 WHERE rowid = 10;
-} {keener {}
-  {SELECT word, rank, NULL, langid, id FROM "main"."t3_vocab" WHERE rowid=?}
-}
-do_tracesql_test 6.2.3 {
-  SELECT word, distance FROM t3 WHERE rowid = 10 AND word MATCH 'kiiner';
-} {keener 300
-  {SELECT id, word, rank, k1  FROM "main"."t3_vocab" WHERE langid=0 AND k2>=?1 AND k2<?2}
 }