Fixed a few tests in pagerfault.test so they work correctly on Windows.

FossilOrigin-Name: ffbdd954a05c003a213069e39ad0655e77983666

diff --git a/manifest b/manifest
index dc523d2ff937c57061bb237ab6aa39c822529c89..e9d2864d445e064a9dd18dc9d4dafd21e89fb1e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changes\sto\stest\sscripts\sso\sthat\sthe\s"inmemory_journal"\spermutation\sworks\swith\s[ef126e775a].
-D 2010-07-08T09:44:42
+C Fixed\sa\sfew\stests\sin\spagerfault.test\sso\sthey\swork\scorrectly\son\sWindows.
+D 2010-07-08T13:33:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -537,7 +537,7 @@ F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
 F test/pager1.test d8e4b2bc8164c920e6ea0572c9e13576d6e4f3fa
 F test/pager2.test f5c757c271ce642d36a393ecbfb3aef1c240dcef
-F test/pagerfault.test 7d16f91a88e79c369d59b019615f3472297213f9
+F test/pagerfault.test f61e7944aef431a23775f8c85599cb158875ad9b
 F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
 F test/pageropt.test 8146bf448cf09e87bb1867c2217b921fb5857806
 F test/pagesize.test 76aa9f23ecb0741a4ed9d2e16c5fa82671f28efb
@@ -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 5aa2bdb502d70ccbc249a6b38b8a07b91c4ccd26
-R 9dc833f21280e696a7395bd9db154b17
-U dan
-Z f94371008135c6c987152f6a482f93e2
+P f553c8ed04b4b2df8ff4929e0754e3ffd1d01ba4
+R bd274984df3fef92dd841137763ec680
+U shaneh
+Z 228c964fca82b25b0e486b35d26aa1d3

diff --git a/manifest.uuid b/manifest.uuid
index 475632585e79e5c8fedc14eec8dea1c8607d908f..759795bb8cc109358f74832b8054aac2e5e8b909 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f553c8ed04b4b2df8ff4929e0754e3ffd1d01ba4
\ No newline at end of file
+ffbdd954a05c003a213069e39ad0655e77983666
\ No newline at end of file

diff --git a/test/pagerfault.test b/test/pagerfault.test
index 39f97d505622edfe9444258a91d17f48f623197f..81829b4a80331cdeac07483a14aaa581552d63f4 100644 (file)
--- a/test/pagerfault.test
+++ b/test/pagerfault.test
@@ -679,6 +679,7 @@ do_faultsim_test pagerfault-14a -prep {
   faultsim_test_result {0 {}} {1 {}} {1 {SQL logic error or missing database}}
 }
 do_faultsim_test pagerfault-14b -prep {
+  catch { db2 close }
   faultsim_restore_and_reopen
   sqlite3 db2 ""
   db2 eval { PRAGMA page_size = 4096; CREATE TABLE xx(a) }
@@ -693,6 +694,7 @@ do_faultsim_test pagerfault-14b -prep {
   faultsim_test_result {0 {}}
 }
 do_faultsim_test pagerfault-14c -prep {
+  catch { db2 close }
   faultsim_restore_and_reopen
   sqlite3 db2 test.db2
   db2 eval { 
@@ -815,6 +817,7 @@ do_faultsim_test pagerfault-17c -prep {
   faultsim_integrity_check
 }
 do_faultsim_test pagerfault-17d -prep {
+  catch { db2 close }
   faultsim_restore_and_reopen
   sqlite3 db2 test.db
   execsql { PRAGMA journal_mode = delete }
@@ -827,6 +830,7 @@ do_faultsim_test pagerfault-17d -prep {
   faultsim_integrity_check
 }
 do_faultsim_test pagerfault-17e -prep {
+  catch { db2 close }
   faultsim_restore_and_reopen
   sqlite3 db2 test.db
   execsql { PRAGMA journal_mode = delete }