Fix test script bugs in the thread002.test and thread_common.tcl. (CVS 6352)

FossilOrigin-Name: d137e841ce90be92f4c18218f35d22e3a06b0f14

diff --git a/manifest b/manifest
index bb1b49f71ee0cb2d79dd580ce24b0b00a78b4c4e..fe745363f22c1a24e942bbf2a72481a372a4f845 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\sfinished()\sarray\sin\sthread005.test\sis\scleared\sbefore\sthe\nscript\sstarts.\s(CVS\s6351)
-D 2009-03-16T17:07:57
+C Fix\stest\sscript\sbugs\sin\sthe\sthread002.test\sand\sthread_common.tcl.\s(CVS\s6352)
+D 2009-03-17T15:39:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -558,13 +558,13 @@ F test/temptable.test 5d8ca46be28cc06c887c5a77df650843b7edbae1
 F test/temptrigger.test 03093be9967942623232dfdf2a63b832d4e0e4fa
 F test/tester.tcl 66546f6766029384360b24cacb3896376c5f5f69
 F test/thread001.test 06c45ed9597d478e7bbdc2a8937e1ebea2a20a32
-F test/thread002.test 2ad15eb5fad9e0e291923e132e712e2da62b59f0
+F test/thread002.test 4338c3d7c5f2f781adc3dba956dfd92722397408
 F test/thread003.test a8bc91af1d9d524148dd84e4d6a196ba17521e08
 F test/thread004.test 9d8ea6a9b0d62d35ad0b967e010d723ed99f614a
 F test/thread005.test eefba87ff7aab212db4e8e19a0b01cdb73e3e536
 F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
 F test/thread2.test 91f105374f18a66e73a3254c28fe7c77af69bdea
-F test/thread_common.tcl 047f80288b5e1e86bed181097d67e640f1a54a74
+F test/thread_common.tcl bde5a0faa9fc57e24140483d512718d72bfc42e2
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/tkt1435.test f8c52c41de6e5ca02f1845f3a46e18e25cadac00
@@ -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 fdfe22f0a568b5e8a5a2ad302d7c06b2696809b0
-R f0b488a5f10b6e35be704357c6ac8c5e
+P ddadc25d550efd56e319bf5508c27d66e346be1b
+R 1f9714beff163e3047ffb3c5d25b0e69
 U drh
-Z 6b26ed88e6bdcf8ca8bd45cbdadab791
+Z fb29d211fd04d1cc5ee32d676ae94379

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

diff --git a/test/thread002.test b/test/thread002.test
index 4b21fe7efee9baea9c926ce11e66ee7fe52a78f8..a268bd411aa6d6542d752ba44ae91fe81d9e5513 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.7 2009/03/16 17:07:57 drh Exp $
+# $Id: thread002.test,v 1.8 2009/03/17 15:39:31 drh Exp $
 
 set testdir [file dirname $argv0]
 
@@ -63,8 +63,8 @@ set thread_program {
     execsql { SELECT * FROM aux3.t1 }
     execsql { INSERT INTO aux3.t1(v) SELECT sum(v) FROM aux1.t1 }
 
-    execsql { CREATE TABLE aux1.t2(a,b) }
-    execsql { DROP TABLE aux1.t2 }
+    execsql { CREATE TABLE IF NOT EXISTS aux1.t2(a,b) }
+    execsql { DROP TABLE IF EXISTS aux1.t2 }
 
     # if {($ii%10)==0} {puts -nonewline . ; flush stdout}
     puts -nonewline . ; flush stdout

diff --git a/test/thread_common.tcl b/test/thread_common.tcl
index 213e653d2309b1be40239568f242c2df6e72f73d..7e48479cedf5867e7659e59264c1823c46443f1e 100644 (file)
--- a/test/thread_common.tcl
+++ b/test/thread_common.tcl
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: thread_common.tcl,v 1.3 2009/01/19 17:40:12 drh Exp $
+# $Id: thread_common.tcl,v 1.4 2009/03/17 15:39:31 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -50,7 +50,7 @@ set thread_procs {
         }
         set rc [sqlite3_finalize $::STMT]
       } else {
-        if {[string first (6) $msg]} {
+        if {[lindex $msg 0]=="(6)"} {
           set rc SQLITE_LOCKED
         } else {
           set rc SQLITE_ERROR