Fix test script problems causing errors in the "inmemory_journal" permutations.

FossilOrigin-Name: ea05b7f929e4696175dbc3ded36dba8ed2a6b575

diff --git a/manifest b/manifest
index 0e689ca0c8e7537cbc78419bc605cd59061380c0..62365a529b959b59dfe2047a777e5ff5f5c4ffa1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\srestarting\s(wrapping)\sa\slog\sfile,\sset\sall\sunused\saReadMark[]\sslots\sto\sREADMARK_NOT_USED\sinstead\sof\s0.\sSetting\sthem\sto\s0\sdoes\snot\scause\sa\sproblem,\sbut\smay\scause\sSQLite\sto\sobtain\sand\srelease\sa\sfew\smore\sfile\slocks\sthan\swould\sotherwise\sbe\snecessary.
-D 2010-06-09T16:58:50
+C Fix\stest\sscript\sproblems\scausing\serrors\sin\sthe\s"inmemory_journal"\spermutations.
+D 2010-06-09T19:01:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -535,7 +535,7 @@ F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
 F test/pcache.test eebc4420b37cb07733ae9b6e99c9da7c40dd6d58
 F test/pcache2.test 0d85f2ab6963aee28c671d4c71bec038c00a1d16
-F test/permutations.test f22a00e318726c6d3f2640afcaf892b33ca4df60
+F test/permutations.test ad10d7b31b4a585977380886c832e2ac13c41237
 F test/pragma.test 6960f9efbce476f70ba9ee2171daf5042f9e3d8a
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 05970cde31b1a9f54bd75af60597be75a5c54fea
@@ -606,7 +606,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 800c36623d67a2ad1f58784b9c5644e0405af6e6
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl 46209e2b39647700162a3bfae7834f6f191dc08b
+F test/tester.tcl 2e19f173752b743526c61e0ee9b84c0db05d46b0
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -818,7 +818,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 6eb058dda8d5f87b02378d8efd821fe64a525dcc
-R a79b3d9ec9cc5a465c33dfd4ba1930ca
+P 0797b10c0cc08ae38e26685d1f8331e37d428781
+R 0f855307664cb1ca52575ec5a7405d2c
 U dan
-Z ad2df864c12e81459be20eda05356b43
+Z f5cf208a50969170a03db1999e99f274

diff --git a/manifest.uuid b/manifest.uuid
index 0f65205059299348043507062b53cbe3ac330989..7117708a9dcdd868e8730c214cde9f5d52215fc4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0797b10c0cc08ae38e26685d1f8331e37d428781
\ No newline at end of file
+ea05b7f929e4696175dbc3ded36dba8ed2a6b575
\ No newline at end of file

diff --git a/test/permutations.test b/test/permutations.test
index 87a9b8a6c9272b274ba4efcb288592149ae9ff57..13c1ae4c63b23456ede3aa6b4d92ba1a568175fb 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -478,7 +478,7 @@ run_tests "inmemory_journal" -description {
   stmt.test
 
   # WAL mode is different.
-  walmode.test
+  walmode.test walfault.test wal.test wal2.test wal3.test
 }
 
 ifcapable mem3 {

diff --git a/test/tester.tcl b/test/tester.tcl
index 07e91f10d2d1a711c08f21091a41c38a6790d57a..d8226e32f2e245c2b081749606d0b0627c53866f 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -102,11 +102,13 @@ if {[info command sqlite_orig]==""} {
         lappend args -key {xyzzy}
       }
 
-      uplevel 1 sqlite_orig $args
+      set res [uplevel 1 sqlite_orig $args]
 
       if {[info exists ::G(perm:presql)]} {
         [lindex $args 0] eval $::G(perm:presql)
       }
+
+      set res
     } else {
       # This command is not opening a new database connection. Pass the 
       # arguments through to the C implemenation as the are.