Make sure the finished() array in thread005.test is cleared before the

script starts. (CVS 6351)

FossilOrigin-Name: ddadc25d550efd56e319bf5508c27d66e346be1b

diff --git a/manifest b/manifest
index febdeced82c08ad3a4326a2be6b7126590cb48e6..bb1b49f71ee0cb2d79dd580ce24b0b00a78b4c4e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\squick.test\sto\ssupport\sthe\sQUICKTEST_INCLUDE\senvironment\svariable,\swhich\scan\sbe\sused\sto\soverride\sthe\sbuilt-in\sEXCLUDE\slist.\s(CVS\s6350)
-D 2009-03-16T14:48:19
+C Make\ssure\sthe\sfinished()\sarray\sin\sthread005.test\sis\scleared\sbefore\sthe\nscript\sstarts.\s(CVS\s6351)
+D 2009-03-16T17:07:57
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -558,10 +558,10 @@ F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1
 F test/temptrigger.test 03093be9967942623232dfdf2a63b832d4e0e4fa
 F test/tester.tcl 66546f6766029384360b24cacb3896376c5f5f69
 F test/thread001.test 06c45ed9597d478e7bbdc2a8937e1ebea2a20a32
-F test/thread002.test 3c03900f03fd2fe8e2fbb1bbdef7fa8206fdb7ad
+F test/thread002.test 2ad15eb5fad9e0e291923e132e712e2da62b59f0
 F test/thread003.test a8bc91af1d9d524148dd84e4d6a196ba17521e08
 F test/thread004.test 9d8ea6a9b0d62d35ad0b967e010d723ed99f614a
-F test/thread005.test 5141b3ee8debc99549f62512265a50be36d1b6a6
+F test/thread005.test eefba87ff7aab212db4e8e19a0b01cdb73e3e536
 F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
 F test/thread2.test 91f105374f18a66e73a3254c28fe7c77af69bdea
 F test/thread_common.tcl 047f80288b5e1e86bed181097d67e640f1a54a74
@@ -707,7 +707,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 4dae5f6ed1662ca1c5c26d57049f7d349299468c
-R 2067a145cc50e0af662e0badf6001fed
-U danielk1977
-Z 047100a34f8b19dcfeccb468b80faa0c
+P fdfe22f0a568b5e8a5a2ad302d7c06b2696809b0
+R f0b488a5f10b6e35be704357c6ac8c5e
+U drh
+Z 6b26ed88e6bdcf8ca8bd45cbdadab791

diff --git a/manifest.uuid b/manifest.uuid
index 76b2d4a7860d41d330fe7e3db5a5d12fac24634a..aacaf4d27f70595dca38d09f7a00f68d137c38b2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fdfe22f0a568b5e8a5a2ad302d7c06b2696809b0
\ No newline at end of file
+ddadc25d550efd56e319bf5508c27d66e346be1b
\ No newline at end of file

diff --git a/test/thread002.test b/test/thread002.test
index 7c5e6b3b0008b467ef7da668dbbed1ce1ea346ad..4b21fe7efee9baea9c926ce11e66ee7fe52a78f8 100644 (file)
--- a/test/thread002.test
+++ b/test/thread002.test
@@ -12,7 +12,7 @@
 #   This test attempts to deadlock SQLite in shared-cache mode.
 #     
 #
-# $Id: thread002.test,v 1.6 2009/02/12 17:06:41 drh Exp $
+# $Id: thread002.test,v 1.7 2009/03/16 17:07:57 drh Exp $
 
 set testdir [file dirname $argv0]
 
@@ -88,7 +88,7 @@ for {set i 0} {$i < $::NTHREAD} {incr i} {
   if {![info exists finished($i)]} {
     vwait finished($i)
   }
-  do_test thread001.2.$i {
+  do_test thread002.2.$i {
     set ::finished($i)
   } OK
 }

diff --git a/test/thread005.test b/test/thread005.test
index 6bd358dc15352a1ce86753ba05273dfc92e2e054..9d97421b9340beee3c6dbe90c47be7784a16bcd0 100644 (file)
--- a/test/thread005.test
+++ b/test/thread005.test
@@ -11,7 +11,7 @@
 #
 # Test a race-condition that shows up in shared-cache mode.
 #
-# $Id: thread005.test,v 1.1 2009/03/12 14:43:28 danielk1977 Exp $
+# $Id: thread005.test,v 1.2 2009/03/16 17:07:57 drh Exp $
 
 set testdir [file dirname $argv0]
 
@@ -80,6 +80,7 @@ set ::enable_shared_cache [sqlite3_enable_shared_cache]
 sqlite3_enable_shared_cache 1
 
 file delete -force test.db test2.db
+unset -nocomplain finished
 
 do_test thread005-1.1 {
   sqlite3 db test.db
@@ -171,4 +172,3 @@ do_test thread005-1.3 {
 
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
-