Run some of the existing test scripts with optimizations disabled as part of all...

FossilOrigin-Name: b0634d2f909fb192d20315e59fa31fcd8f316541

diff --git a/manifest b/manifest
index 8b63d0fbd94f9003cae4eb98f584d609bc750ebf..d92607189bcb903564ea1bc217c8ac9bf1feea37 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sto\stkt-80ba201079.test.
-D 2010-12-07T07:57:50
+C Run\ssome\sof\sthe\sexisting\stest\sscripts\swith\soptimizations\sdisabled\sas\spart\sof\sall.test.
+D 2010-12-07T14:32:29
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -243,7 +243,7 @@ F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c fa22d45b2577c77146f2e894d58011d472d64103
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
-F test/all.test 6745008c144bd2956d58864d21f7b304689c1cce
+F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
 F test/alter.test 15f9224868b290d6bf7a63f31437f31aee070636
 F test/alter2.test 75f731508f1bf27ba09a6075c66cd02216ba464b
 F test/alter3.test 8677e48d95536f7a6ed86a1a774744dadcc22b07
@@ -584,7 +584,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test 4118a183908ecaed343a06fcef3ba82e87e0129d
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test 6c2b9b76b99bf2e9e4abe479f92132f69b69e6e1
+F test/permutations.test c0ce0f3b741dd92a6d4c2671dbacba4b92dd81eb
 F test/pragma.test fdfc09067ea104a0c247a1a79d8093b56656f850
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -662,7 +662,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl 0c8c0a7c4d5944026728f33a1c06e014b1648768
+F test/tester.tcl dafe0d30279f6d380d5d2a535781dda91b8cfc3f
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -894,7 +894,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P fabcb6b95e1d4059d1e6c6183f65846f6cbd5749
-R a62680e5755d8abc6c8d1de652b8a83d
+P c370338c772bcd0797a23f83c3f6dc019640c6dd
+R c899dedfcbfad993e519fd17027aa5c1
 U dan
-Z 863ac080b5a3ea11bc9de517f38f2c30
+Z 85d014326478c03ad494360917cb8b7d

diff --git a/manifest.uuid b/manifest.uuid
index 35d58786721d7634f77a7121eed6424d4d730314..4f6e06f641a0d346fedc0cb1e586db86c9fb5b42 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c370338c772bcd0797a23f83c3f6dc019640c6dd
\ No newline at end of file
+b0634d2f909fb192d20315e59fa31fcd8f316541
\ No newline at end of file

diff --git a/test/all.test b/test/all.test
index 8ccc0a64f35a9ea6e4560f89028ddd7362ee983f..967124668152beeeee5e657bb17fc13f3fba0aa9 100644 (file)
--- a/test/all.test
+++ b/test/all.test
@@ -16,6 +16,7 @@ source $testdir/permutations.test
 
 run_test_suite full
 
+run_test_suite no_optimization 
 run_test_suite memsubsys1 
 run_test_suite memsubsys2 
 run_test_suite singlethread 

diff --git a/test/permutations.test b/test/permutations.test
index 9dd114ca4708104e74a33d53eec125ae6bd2bba2..d336a3a19af38c7bcf125ac84c9b55efab3aea23 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -25,6 +25,7 @@ db close
 #       -presql      SQL                    (default "")
 #       -files       LIST-OF-FILES          (default $::ALLTESTS)
 #       -prefix      NAME                   (default "$::NAME.")
+#       -dbconfig    SCRIPT                 (default "")
 #
 proc test_suite {name args} {
 
@@ -34,6 +35,7 @@ proc test_suite {name args} {
   set default(-description) "no description supplied (fixme)"
   set default(-files)       ""
   set default(-prefix)      "${name}."
+  set default(-dbconfig)    ""
 
   array set options [array get default]
   if {[llength $args]%2} {
@@ -48,7 +50,6 @@ proc test_suite {name args} {
 
   set     ::testspec($name) [array get options]
   lappend ::testsuitelist $name
-
 }
 
 #-------------------------------------------------------------------------
@@ -758,6 +759,19 @@ test_suite "rtree" -description {
   All R-tree related tests. Provides coverage of source file rtree.c.
 } -files [glob -nocomplain $::testdir/../ext/rtree/*.test]
 
+test_suite "no_optimization" -description {
+  Run test scripts with optimizations disabled using the
+  sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS) interface.
+} -files {
+  where.test where2.test where3.test where4.test where5.test
+  where6.test where7.test where8.test where9.test
+  whereA.test whereB.test wherelimit.test
+  select1.test select2.test select3.test select4.test select5.test
+  select7.test select8.test selectA.test selectC.test
+} -dbconfig {
+  optimization_control $::dbhandle all 0
+}
+
 # End of tests
 #############################################################################
 
@@ -779,6 +793,7 @@ proc run_tests {name args} {
   set ::G(perm:prefix)       $options(-prefix)
   set ::G(perm:presql)       $options(-presql)
   set ::G(isquick)           1
+  set ::G(perm:dbconfig)     $options(-dbconfig)
 
   uplevel $options(-initialize)
 
@@ -792,6 +807,7 @@ proc run_tests {name args} {
   unset ::G(perm:name)
   unset ::G(perm:prefix)
   unset ::G(perm:presql)
+  unset ::G(perm:dbconfig)
 }
 
 proc run_test_suite {name} {

diff --git a/test/tester.tcl b/test/tester.tcl
index 955672ea5c1b288c86e9619cdbfea8c67d183d1d..4c7c10ed733b56f72f8cd6072fee531b196841d6 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -109,6 +109,10 @@ if {[info command sqlite_orig]==""} {
       if {[info exists ::G(perm:presql)]} {
         [lindex $args 0] eval $::G(perm:presql)
       }
+      if {[info exists ::G(perm:dbconfig)]} {
+        set ::dbhandle [lindex $args 0]
+        uplevel #0 $::G(perm:dbconfig)
+      }
       set res
     } else {
       # This command is not opening a new database connection. Pass the