From: danielk1977 <danielk1977@noemail.net>
Date: Mon, 12 Jan 2009 14:01:45 +0000 (+0000)
Subject: Only run tests that depend on SQLITE_PREFER_PROXY_LOCKING builds when said symbol... 
X-Git-Tag: version-3.6.10~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=838cce4382ad3e712dc22c895170510852ac44ea;p=thirdparty%2Fsqlite.git

Only run tests that depend on SQLITE_PREFER_PROXY_LOCKING builds when said symbol is set. (CVS 6169)

FossilOrigin-Name: 5d88f8be7342acd2a7ed6f269bec615cd03e59e2
---

diff --git a/manifest b/manifest
index 4468166876..2a07b27256 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Sometimes\sa\ssingle\sbyte\sis\swritten\sto\sthe\smain\sdatabase\sfile.\s\sMake\ssure\nthat\sjournaltest\sknows\sthis.\s(CVS\s6168)
-D 2009-01-11T18:24:27
+C Only\srun\stests\sthat\sdepend\son\sSQLITE_PREFER_PROXY_LOCKING\sbuilds\swhen\ssaid\ssymbol\sis\sset.\s(CVS\s6169)
+D 2009-01-12T14:01:45
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 05461a9b5803d5ad10c79f989801e9fd2cc3e592
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -175,7 +175,7 @@ F src/test9.c 904ebe0ed1472d6bad17a81e2ecbfc20017dc237
 F src/test_async.c 45024094ed7cf780c5d5dccda645145f95cf78ef
 F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
 F src/test_btree.c d7b8716544611c323860370ee364e897c861f1b0
-F src/test_config.c e568dc1062a79710e05e5ae79b168b7c64bf7e5d
+F src/test_config.c 9dd62f4bb725ad87d28b187b07377cb4f4a43197
 F src/test_devsym.c 9f4bc2551e267ce7aeda195f3897d0f30c5228f4
 F src/test_func.c a55c4d5479ff2eb5c0a22d4d88e9528ab59c953b
 F src/test_hexio.c 2f1122aa3f012fa0142ee3c36ce5c902a70cd12f
@@ -426,7 +426,7 @@ F test/lock2.test 018b846f6f3b3b695fad07e317b7988442b556f4
 F test/lock3.test 8adfbf438b96316267611214d494ebc1311b8cda
 F test/lock4.test 09d97d52cae18fadfe631552af9880dac6b3ae90
 F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
-F test/lock6.test f4e9052b14da3bd6807a757d5aed15c17321031a
+F test/lock6.test eafa70db6f50b6f6291f4f83b80e98834724a50d
 F test/lookaside.test e69f822f13745f1d5c445c6e30e30f059f30c8e5
 F test/main.test 187a9a1b5248ed74a83838c581c15ec6023b555b
 F test/make-where7.tcl 40bb740b37eead343eaf57b74ab72d2a5a304745
@@ -481,7 +481,7 @@ F test/pagesize.test 0d9ff3fedfce6e5ffe8fa7aca9b6d3433a2e843b
 F test/pcache.test ccd18b4d2b432f44319a82b0367ed843ee18cebd
 F test/pcache2.test 46efd980a89f737847b99327bda19e08fe11e402
 F test/permutations.test 2e777ae1eeb11b777b31aad929c4351464758441
-F test/pragma.test 3fd4d3cc9f48aa5f2fb050d17234222ddac68ec6
+F test/pragma.test a35b0be36542477183168cdb8b743f5c0d883c4d
 F test/pragma2.test 5364893491b9231dd170e3459bfc2e2342658b47
 F test/printf.test 262a5acd3158f788e9bdf7f18d718f3af32ff6ef
 F test/progress.test 5b075c3c790c7b2a61419bc199db87aaf48b8301 x
@@ -696,7 +696,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P fd2bbcf8d8d03eecd4614636ae787331a8e99816
-R 58d0c56663f89806448d594972867594
-U drh
-Z 97134145a04bbdb0bbd12839d64c2ff0
+P e0af5a43f3c6ae41042c74339e7404d3373fd6ce
+R 19b82c43a9e4fa6c4de3bc8b780a712d
+U danielk1977
+Z 6d683817d13d341eb8858c2edcdac0c3
diff --git a/manifest.uuid b/manifest.uuid
index ca05d2a686..394196b624 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e0af5a43f3c6ae41042c74339e7404d3373fd6ce
\ No newline at end of file
+5d88f8be7342acd2a7ed6f269bec615cd03e59e2
\ No newline at end of file
diff --git a/src/test_config.c b/src/test_config.c
index 5658138567..e3bcf0d784 100644
--- a/src/test_config.c
+++ b/src/test_config.c
@@ -16,7 +16,7 @@
 ** The focus of this file is providing the TCL testing layer
 ** access to compile-time constants.
 **
-** $Id: test_config.c,v 1.46 2009/01/09 21:41:17 drh Exp $
+** $Id: test_config.c,v 1.47 2009/01/12 14:01:45 danielk1977 Exp $
 */
 
 #include "sqliteLimit.h"
@@ -404,6 +404,11 @@ Tcl_SetVar2(interp, "sqlite_options", "long_double",
 #else
   Tcl_SetVar2(interp,"sqlite_options","lock_proxy_pragmas","0",TCL_GLOBAL_ONLY);
 #endif
+#if defined(SQLITE_PREFER_PROXY_LOCKING) && defined(__APPLE__)
+  Tcl_SetVar2(interp,"sqlite_options","prefer_proxy_locking","1",TCL_GLOBAL_ONLY);
+#else
+  Tcl_SetVar2(interp,"sqlite_options","prefer_proxy_locking","0",TCL_GLOBAL_ONLY);
+#endif
     
     
 #ifdef SQLITE_OMIT_SHARED_CACHE
diff --git a/test/lock6.test b/test/lock6.test
index 23d32ebd62..cbfb5661a5 100644
--- a/test/lock6.test
+++ b/test/lock6.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock6.test,v 1.1 2008/11/21 00:10:35 aswift Exp $
+# $Id: lock6.test,v 1.2 2009/01/12 14:01:45 danielk1977 Exp $
 
 
 set testdir [file dirname $argv0]
@@ -78,7 +78,7 @@ puts $f {
 close $f
 
 
-ifcapable lock_proxy_pragmas {
+ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
   set sqlite_hostid_num 1
 
   set using_proxy 0
diff --git a/test/pragma.test b/test/pragma.test
index aea0027ac3..56afa3da46 100644
--- a/test/pragma.test
+++ b/test/pragma.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.72 2009/01/09 21:41:17 drh Exp $
+# $Id: pragma.test,v 1.73 2009/01/12 14:01:45 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -1284,7 +1284,7 @@ sqlite3 dbX :memory:
 dbX eval {PRAGMA temp_store_directory = ""}
 dbX close
 
-ifcapable lock_proxy_pragmas {
+ifcapable lock_proxy_pragmas&&prefer_proxy_locking {
   set sqlite_hostid_num 1
 
   set using_proxy 0