Avoid running thread1.test or thread2.test if SQLITE_MUTEX_NOOP is defined.

FossilOrigin-Name: 532ae32ea0f5e821dac643cbc4b041c103cadfdc

diff --git a/manifest b/manifest
index 70509467f7f9dbfb5003bee6f069e77b3f27ed91..518827889cf42cdd2f4cd48bc7d3a52ac635a90a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\srun\smulti-threaded\sTcl\stests\sif\sthe\slibrary\swas\sbuilt\swith\sSQLITE_MUTEX_NOOP\sdefined.
-D 2011-04-07T10:09:00.583
+C Avoid\srunning\sthread1.test\sor\sthread2.test\sif\sSQLITE_MUTEX_NOOP\sis\sdefined.
+D 2011-04-07T14:05:47.844
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -692,8 +692,8 @@ F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
 F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
 F test/thread005.test bf5c374ca65dd89fd56c8fe511ccfb46875bda5e
-F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
-F test/thread2.test e08034b83fe9693ade77049732518e5b3d2d700d
+F test/thread1.test df115faa10a4ba1d456e9d4d9ec165016903eae4
+F test/thread2.test f35d2106452b77523b3a2b7d1dcde2e5ee8f9e46
 F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
@@ -927,7 +927,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 29c7b42587000704d61f49badd584ac7040c3d7d
-R d74328ff56374f7a92f06da23007061f
+P e4e99606fdf1f1cecf914dc865b066bf07793d1f
+R 42c41e910cfc7e1c1b9040c4c34f5e86
 U dan
-Z bfc44684e4ef88e4862d7f932c4ec0cd
+Z e11fdaaab64fe55fe7338be760f5f876

diff --git a/manifest.uuid b/manifest.uuid
index a26ee76d9d762902f018dcbd400d6b82e81f7fb3..4b9265b79fc758e25599e1e34263ea4a691f76d1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e4e99606fdf1f1cecf914dc865b066bf07793d1f
\ No newline at end of file
+532ae32ea0f5e821dac643cbc4b041c103cadfdc
\ No newline at end of file

diff --git a/test/thread1.test b/test/thread1.test
index 70bcc22c224b7dc3b3d18bd58f4ad5085ed35f2b..0618f2c66f81cd4caa802b6d02f51fbdac3cdcfa 100644 (file)
--- a/test/thread1.test
+++ b/test/thread1.test
@@ -19,10 +19,7 @@ source $testdir/tester.tcl
 
 # Skip this whole file if the thread testing code is not enabled
 #
-ifcapable !mutex {
-  finish_test
-  return
-}
+if {[run_thread_tests]==0} { finish_test ; return }
 if {[llength [info command thread_step]]==0 || [sqlite3 -has-codec]} {
   finish_test
   return

diff --git a/test/thread2.test b/test/thread2.test
index 253b3d61ca426da8e0bd299430bd3ed1755c3f73..dad2bf2c5f4b1881af82362c11818b8093e9f762 100644 (file)
--- a/test/thread2.test
+++ b/test/thread2.test
@@ -17,11 +17,7 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable !mutex {
-  finish_test
-  return
-}
-
+if {[run_thread_tests]==0} { finish_test ; return }
 
 # Skip this whole file if the thread testing code is not enabled
 #