Add a short pause to force a context swap while waiting for a separate process

to clear its lock in the lock4.test script. (CVS 6610)

FossilOrigin-Name: 4357e76d53f692cb7495fbde61b4b7580560f816

diff --git a/manifest b/manifest
index ded48042f5c474cf7f7c2a12c0fe32515ca116dd..2fdf8a2c4bdd1ebb52702c006e53bc34a4c69527 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\stest\scase\smisc3-6.11\sso\sthat\sit\sworks\scorrectly\son\sUTF16\sdatabases\nafter\sthe\sfix\sof\sfor\sticket\s#3838,\scheck-in\s(6603)\s(CVS\s6609)
-D 2009-05-06T00:49:01
+C Add\sa\sshort\spause\sto\sforce\sa\scontext\sswap\swhile\swaiting\sfor\sa\sseparate\sprocess\nto\sclear\sits\slock\sin\sthe\slock4.test\sscript.\s(CVS\s6610)
+D 2009-05-06T00:52:41
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -438,7 +438,7 @@ F test/loadext2.test 0bcaeb4d81cd5b6e883fdfea3c1bdbe1f173cbca
 F test/lock.test edf5585398a33534db71a2a6108308d9e89c16d1
 F test/lock2.test 7bb642551df59b3de135291d62ee82409420181e
 F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
-F test/lock4.test 991b57669a868bbfd39fe0c0df0d493985829105
+F test/lock4.test f4f36271aa5ae1da449646bf43c7341f6b2b4c4e
 F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
 F test/lock6.test 862aa71e97b288d6b3f92ba3313f51bd0b003776
 F test/lookaside.test 1dd350dc6dff015c47c07fcc5a727a72fc5bae02
@@ -728,7 +728,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 9e3016c1846174a64833394a00a09335e8446de8
-R b88c7ddb86a82d9458d109084a26600e
+P c1e739e39b1df205f3beb4088ce7760a0d56359f
+R 2672359e21ab734b97c78750b0209c2d
 U drh
-Z e32515574a73e07f4425088418907a33
+Z 59fab89a94744c99e14b75dd09367216

diff --git a/manifest.uuid b/manifest.uuid
index 5fe676c29fe3e5244b2f49cff8ada29f0de085ad..dd7525c862f7e2a7dbaa1b629a6967761a615d31 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1e739e39b1df205f3beb4088ce7760a0d56359f
\ No newline at end of file
+4357e76d53f692cb7495fbde61b4b7580560f816
\ No newline at end of file

diff --git a/test/lock4.test b/test/lock4.test
index 77de346f5e16ad05048075c0d677d44eeadac159..a8cacb1ccaa541de21ee2f6ac8c7af422c827e84 100644 (file)
--- a/test/lock4.test
+++ b/test/lock4.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is database locks.
 #
-# $Id: lock4.test,v 1.9 2009/02/05 16:31:46 drh Exp $
+# $Id: lock4.test,v 1.10 2009/05/06 00:52:41 drh Exp $
 
 
 set testdir [file dirname $argv0]
@@ -102,6 +102,7 @@ do_test lock4-1.3 {
   # deleting the journal file. But it might retain the lock for a 
   # fraction longer 
   #
+  after 25
   db2 eval {
      SELECT * FROM t2
   }