Ensure that thread001.test and thread002.test reset the global shared-cache-enabled...

FossilOrigin-Name: 416288a9fa39c7c4d9d414de18edc0423ed83794

diff --git a/manifest b/manifest
index 442b2baa042b3a5b25db2caa80855976c38d5f4d..cf8509c629d44b255c58a6de4eb7ac1d2e509a25 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sattempt\sto\suse\sthe\ssub-journal\sfile\sdescriptor\sif\sit\sis\snot\sopened\s(as\sin\sjournal_mode=off\smode).\sTicket\s#3636.\s(CVS\s6252)
-D 2009-02-04T10:09:04
+C Ensure\sthat\sthread001.test\sand\sthread002.test\sreset\sthe\sglobal\sshared-cache-enabled\ssetting\sbefore\sthey\sfinish.\s(CVS\s6253)
+D 2009-02-04T11:57:46
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c7a5a30fb6852bd7839b1024e1661da8549878ee
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -552,8 +552,8 @@ F test/tclsqlite.test 30636c3151ccc2d553aa09020b885054141a1963
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
 F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125
 F test/tester.tcl 3d11a8c1d05535400880ac4f8c5402b8dee14b7f
-F test/thread001.test 71dca5edec5e44b56a9043da1ce7651c12216fe1
-F test/thread002.test 84c03a9fc4f7a5f92eefe551266afa840c2eb6ae
+F test/thread001.test 7595e58213eda498794860f608e0ea7e499d18d0
+F test/thread002.test 0258a50c55f2371de2e4c7e02bec2576c1eef359
 F test/thread003.test e17754799649c2b732c295620dca041c32f01e16
 F test/thread1.test 862dd006d189e8b0946935db17399dcac2f8ef91
 F test/thread2.test 91f105374f18a66e73a3254c28fe7c77af69bdea
@@ -700,7 +700,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 72745bde90a9b4ffae1496f1668e4bb0678bd400
-R ba0b4ba1dc1a735a483dbc0860550e91
+P 20bd76055463c85f62a450e368f4bcf7d2215f94
+R 5cd73377bcb5ebdb093e3e59f4a7e629
 U danielk1977
-Z ed7dbdace1bc5288c3b2fdab4664488f
+Z a6a4dc91660a1953af2eb63cac4a4c46

diff --git a/manifest.uuid b/manifest.uuid
index b664fbceadfb07d826ff01db48ff2e88ac216b13..f4808a40f37cafab49c603ec38c10f1d502f4b61 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20bd76055463c85f62a450e368f4bcf7d2215f94
\ No newline at end of file
+416288a9fa39c7c4d9d414de18edc0423ed83794
\ No newline at end of file

diff --git a/test/thread001.test b/test/thread001.test
index cce9ef0f04bd61bd3c65ede5d973676ca3ae0454..6391db1fede3de4b9c565a843eafb17eda16a0e2 100644 (file)
--- a/test/thread001.test
+++ b/test/thread001.test
@@ -9,7 +9,7 @@
 #
 #***********************************************************************
 #
-# $Id: thread001.test,v 1.7 2009/01/19 17:40:12 drh Exp $
+# $Id: thread001.test,v 1.8 2009/02/04 11:57:46 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 
@@ -22,6 +22,8 @@ if {[info commands sqlthread] eq ""} {
   return
 }
 
+set ::enable_shared_cache [sqlite3_enable_shared_cache]
+
 set ::NTHREAD 10
 
 # Run this test three times: 
@@ -144,4 +146,5 @@ foreach {tn same_db shared_cache} [list \
   } {ok}
 }
 
+sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test

diff --git a/test/thread002.test b/test/thread002.test
index 5873ca50f147d40d39c4cf2295ccb880935c7ced..a2900d27cfcce5f315f03a0083cb84675d846254 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.4 2008/10/07 15:25:49 drh Exp $
+# $Id: thread002.test,v 1.5 2009/02/04 11:57:46 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 
@@ -28,7 +28,7 @@ ifcapable !attach||!mutex {
 }
 
 db close
-sqlite3_enable_shared_cache 1
+set ::enable_shared_cache [sqlite3_enable_shared_cache 1]
 
 set ::NTHREAD 10
 
@@ -106,4 +106,5 @@ for {set ii 0} {$ii < 3} {incr ii} {
   } [list [expr 1 + $::NTHREAD*100] ok]
 }
 
+sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test