Fix to lock5.test so that it runs with the inmemory_journal permutation on osx.

FossilOrigin-Name: 948bb54568b5eb26644db78e8cd62381bdc22bac

diff --git a/manifest b/manifest
index e9d2864d445e064a9dd18dc9d4dafd21e89fb1e4..bc27b15b9d0319c04b163d3f46b0c17fe9a51ce8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\sa\sfew\stests\sin\spagerfault.test\sso\sthey\swork\scorrectly\son\sWindows.
-D 2010-07-08T13:33:47
+C Fix\sto\slock5.test\sso\sthat\sit\sruns\swith\sthe\sinmemory_journal\spermutation\son\sosx.
+D 2010-07-08T14:59:02
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -482,7 +482,7 @@ F test/lock.test 842e80b6be816c79525a20b098cca066989feed7
 F test/lock2.test fd305c95b15a6be93416bddcfc923698fc56bd71
 F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
 F test/lock4.test c82268c031d39345d05efa672f80b025481b3ae5
-F test/lock5.test 6b1f78f09ad1522843dad571b76b321e6f439bf7
+F test/lock5.test b2abb5e711bc59b0eae00f6c97a36ec9f458fada
 F test/lock6.test 8df56060f396151777390982422c800d026e1722
 F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
 F test/lock_common.tcl e7013c6208f5fa818735c324eb0249b4c0f317cf
@@ -832,7 +832,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P f553c8ed04b4b2df8ff4929e0754e3ffd1d01ba4
-R bd274984df3fef92dd841137763ec680
-U shaneh
-Z 228c964fca82b25b0e486b35d26aa1d3
+P ffbdd954a05c003a213069e39ad0655e77983666
+R 376244331894da746096727d657ba405
+U dan
+Z 2deedcf77db8f02fa1e630386990141c

diff --git a/manifest.uuid b/manifest.uuid
index 759795bb8cc109358f74832b8054aac2e5e8b909..6a397d76c2a416caeb2e8f79d2ad216668f26d62 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ffbdd954a05c003a213069e39ad0655e77983666
\ No newline at end of file
+948bb54568b5eb26644db78e8cd62381bdc22bac
\ No newline at end of file

diff --git a/test/lock5.test b/test/lock5.test
index 63e7e6baafd276f5d1a4296f65e16b2dd3731f8b..6ec86ba7e4e9af3cbaf51bda79bf0df598d67c6b 100644 (file)
--- a/test/lock5.test
+++ b/test/lock5.test
@@ -121,7 +121,7 @@ do_test lock5-flock.2 {
 } {0}
 
 do_test lock5-flock.3 {
-  sqlite3 db2 test.db -vfs unix-flock
+  catch { sqlite3 db2 test.db -vfs unix-flock }
   catchsql { SELECT * FROM t1 } db2
 } {1 {database is locked}}