From: dan <dan@noemail.net>
Date: Thu, 7 Apr 2011 10:09:00 +0000 (+0000)
Subject: Do not run multi-threaded Tcl tests if the library was built with SQLITE_MUTEX_NOOP... 
X-Git-Tag: version-3.7.6~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7329ed9b3821c0c847af29362375794a8da79437;p=thirdparty%2Fsqlite.git

Do not run multi-threaded Tcl tests if the library was built with SQLITE_MUTEX_NOOP defined.

FossilOrigin-Name: e4e99606fdf1f1cecf914dc865b066bf07793d1f
---

diff --git a/manifest b/manifest
index aad936a7c2..70509467f7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\stest\sscript\sattach4.test\sso\sthat\sit\sworks\swith\stype\s1\sVFS\simplementations\s(no\swal).\sAnd\swal.test\sso\sthat\sit\swork\swith\sa\ssmall\sdefault\spager\scache\ssize.
-D 2011-04-07T05:17:32.622
+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
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -198,7 +198,7 @@ F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
 F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
-F src/test_config.c 62f0f8f934b1d5c7e4cd4f506ae453a1117b47d7
+F src/test_config.c 8f9599650fcd896f62a17be226ae3e439debb5e4
 F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@ -694,7 +694,7 @@ F test/thread004.test f51dfc3936184aaf73ee85f315224baad272a87f
 F test/thread005.test bf5c374ca65dd89fd56c8fe511ccfb46875bda5e
 F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
 F test/thread2.test e08034b83fe9693ade77049732518e5b3d2d700d
-F test/thread_common.tcl 2aa6f2fdcd4d6e461169c3e5ca098eebf643b863
+F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/threadtest3.c 0ed13e09690f6204d7455fac3b0e8ece490f6eef
@@ -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 748c9109c973e1d3e914adbe533f12af7783bfe4
-R 99d9581e40f5efb3517a0b9208c237e8
+P 29c7b42587000704d61f49badd584ac7040c3d7d
+R d74328ff56374f7a92f06da23007061f
 U dan
-Z e2fa6b1af58e1ead18709b6bc0b2be67
+Z bfc44684e4ef88e4862d7f932c4ec0cd
diff --git a/manifest.uuid b/manifest.uuid
index a0c325fcd1..a26ee76d9d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-29c7b42587000704d61f49badd584ac7040c3d7d
\ No newline at end of file
+e4e99606fdf1f1cecf914dc865b066bf07793d1f
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index 6eee524c09..4dc6441f51 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -91,6 +91,12 @@ static void set_options(Tcl_Interp *interp){
   Tcl_SetVar2(interp, "sqlite_options", "mutex", "1", TCL_GLOBAL_ONLY);
 #endif
 
+#ifdef SQLITE_MUTEX_NOOP
+  Tcl_SetVar2(interp, "sqlite_options", "mutex_noop", "1", TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp, "sqlite_options", "mutex_noop", "0", TCL_GLOBAL_ONLY);
+#endif
+
 #ifdef SQLITE_OMIT_ALTERTABLE
   Tcl_SetVar2(interp, "sqlite_options", "altertable", "0", TCL_GLOBAL_ONLY);
 #else
diff --git a/test/thread_common.tcl b/test/thread_common.tcl
index 9b7a95dd9a..6b17082ad4 100644
--- a/test/thread_common.tcl
+++ b/test/thread_common.tcl
@@ -89,6 +89,9 @@ proc run_thread_tests {{print_warning 0}} {
   ifcapable !mutex { 
     set zProblem "SQLite build is not threadsafe"
   }
+  ifcapable mutex_noop { 
+    set zProblem "SQLite build uses SQLITE_MUTEX_NOOP"
+  }
   if {[info commands sqlthread] eq ""} {
     set zProblem "SQLite build is not threadsafe"
   }