Fix test script issues preventing walthread.test from running.

FossilOrigin-Name: d90b1dde0702ceb0eae2a3da36733a7e5b1a6b3a

diff --git a/manifest b/manifest
index 99790f6114794217f99cf0ec47b4bbf5d41788d4..39a867ddd4d0421f9f0d4d783709eda61f84cb4b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spager\sbug\sintroduced\sby\sthe\swal\scode.
-D 2010-04-13T11:18:40
+C Fix\stest\sscript\sissues\spreventing\swalthread.test\sfrom\srunning.
+D 2010-04-13T11:35:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -602,7 +602,7 @@ F test/tclsqlite.test bf4227eb236a4c097aa7974a2bf7d3225acf34be
 F test/tempdb.test 1bf52da28a9c24e29717362a87722dff08feb72b
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl e1f581c7a2648a0aaa51135c4d2e7be68f4b9292
+F test/tester.tcl 49d76f12940160d623da104f995530fc6ee8f46f
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -610,7 +610,7 @@ F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
 F test/thread005.test bf5c374ca65dd89fd56c8fe511ccfb46875bda5e
 F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
 F test/thread2.test 6e0997f7beabb6a7e471bd18740ed04805c785f4
-F test/thread_common.tcl b65e6b1d1d90dc885e10ad080896c6c56eef0819
+F test/thread_common.tcl 0b07423d29ddb73d4bacbac69268c8d37b6cc5d2
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
@@ -756,10 +756,10 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test 653a870ac4b312d421e006ec45a293ecf2135b49
-F test/walcrash.test 76a6848c5088596cf37f4042e7e4c108a8c323d4
-F test/walslow.test 17bfe8052a5d1c64e171eeab45c445fa90f4d4a6
-F test/walthread.test 82cc77f8853217a036fc82e4313ecebd9aa368d7
+F test/wal.test 2c279aad6d34a9f8b8226d65c6d464375fc10343
+F test/walcrash.test df3b4f84d7bb2252914b34ab0995ce4d249779b5
+F test/walslow.test ba50a02439f7ecfc9c92f6ba7b2013a2a707ac80
+F test/walthread.test b03790383ff7ba0119e04f230fcef3b635aab32f
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
 F test/where2.test 45eacc126aabb37959a387aa83e59ce1f1f03820
 F test/where3.test 97d3936e6a443b968f1a61cdcc0f673252000e94
@@ -803,7 +803,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 9d690f24f634696f76fa38372461cfa69263e91e
-R 8f595e612b9933c5a5c59646f7c7d5da
+P 4a0b29dc5e573a5d696ede17db5d7acf8d23aa98
+R 2e081cfd5144f338793cfa49bfc89545
 U dan
-Z 45325555f32460c0270b99616d9c91ef
+Z 734473cb8e02a3d72068235b175d9c7c

diff --git a/manifest.uuid b/manifest.uuid
index 165ffdb1f4a7e00c60f3d037c2a6ce8cfd533795..18cbe3e73a5a029b0dee84ef411c47670ad50867 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a0b29dc5e573a5d696ede17db5d7acf8d23aa98
\ No newline at end of file
+d90b1dde0702ceb0eae2a3da36733a7e5b1a6b3a
\ No newline at end of file

diff --git a/test/tester.tcl b/test/tester.tcl
index 8fe877ec01d0e64f4e19dd32b25367b9258b0b7f..44798a70988ae82cb821a02f71be0627aa400632 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -143,6 +143,7 @@ proc reset_db {} {
   catch {db close}
   file delete -force test.db
   file delete -force test.db-journal
+  file delete -force test.db-wal
   sqlite3 db ./test.db
   set ::DB [sqlite3_connection_pointer db]
   if {[info exists ::SETUP_SQL]} {

diff --git a/test/thread_common.tcl b/test/thread_common.tcl
index bbd9389ea03cd656c01cc34357ec801078c4bf3b..673afdd8021fb63c70a665c04a6d8354e9e57745 100644 (file)
--- a/test/thread_common.tcl
+++ b/test/thread_common.tcl
@@ -80,7 +80,7 @@ set thread_procs {
 }
 
 proc thread_spawn {varname args} {
-  sqlthread spawn $varname [join $args ;]
+  sqlthread spawn $varname [join $args {;}]
 }
 
 # Return true if this build can run the multi-threaded tests.

diff --git a/test/wal.test b/test/wal.test
index 57fccce288b1e2d26c1540a40b0585868d838eee..ed9c821ef25bf3541f566bbfaf079207e7367680 100644 (file)
--- a/test/wal.test
+++ b/test/wal.test
@@ -1,3 +1,17 @@
+# 2010 April 13
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing the operation of the library in
+# "PRAGMA journal_mode=WAL" mode.
+#
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl

diff --git a/test/walcrash.test b/test/walcrash.test
index b3e6cd2b971f13e2308c3dbe96eebe4ca80f6a2c..8d6f720d1b47a18ac6b6c369d3e3fd07eb926150 100644 (file)
--- a/test/walcrash.test
+++ b/test/walcrash.test
@@ -8,7 +8,10 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# This file implements regression tests for SQLite library.
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing the operation of the library when
+# recovering a database following a simulated system failure in 
+# "PRAGMA journal_mode=WAL" mode.
 #
 
 #

diff --git a/test/walslow.test b/test/walslow.test
index cec4e26d98011394d74e8044e81a60676c607df7..d4133f899c2676847c08ce38f9dbbedd18df74cd 100644 (file)
--- a/test/walslow.test
+++ b/test/walslow.test
@@ -8,6 +8,10 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing the operation of the library in
+# "PRAGMA journal_mode=WAL" mode. The tests in this file use 
+# brute force methods, so may take a while to run.
 #
 
 set testdir [file dirname $argv0]

diff --git a/test/walthread.test b/test/walthread.test
index 46474e2cb5d6415f61731b0918cf5037b0255029..934d63325cdf2a9c9c5e665fdb06d94c31a321cb 100644 (file)
--- a/test/walthread.test
+++ b/test/walthread.test
@@ -1,4 +1,4 @@
-# 2007 September 7
+# 2010 April 13
 #
 # The author disclaims copyright to this source code.  In place of
 # a legal notice, here is a blessing:
@@ -8,6 +8,9 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is testing the operation of the library in
+# "PRAGMA journal_mode=WAL" mode.
 #
 
 set testdir [file dirname $argv0]
@@ -141,6 +144,7 @@ set thread_program {
   set ::DB [sqlthread open test.db]
   dosql $::DB { PRAGMA journal_mode = WAL }
 
+
   set rc [catch {
     if {$role eq "worker"} { worker $DB $N }
     if {$role eq "checkpointer"} { checkpointer $DB }