From: drh <drh@noemail.net>
Date: Thu, 8 May 2008 01:11:42 +0000 (+0000)
Subject: Fix the new ioerr4.test so that it plays well with others. (CVS 5103)
X-Git-Tag: version-3.6.10~1074
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95ed6bc3e1d6f227a11ad99d708e5c9db1a65406;p=thirdparty%2Fsqlite.git

Fix the new ioerr4.test so that it plays well with others. (CVS 5103)

FossilOrigin-Name: 75df2d3d506abfa4aa4875fb533a5cd160b3f521
---

diff --git a/manifest b/manifest
index 33ffeb7208..3a2d1c79c5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssome\sproblems\swith\smulti-file\stransactions\sin\spersistent\sjournal\smode.\s(CVS\s5102)
-D 2008-05-07T19:11:03
+C Fix\sthe\snew\sioerr4.test\sso\sthat\sit\splays\swell\swith\sothers.\s(CVS\s5103)
+D 2008-05-08T01:11:42
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 8b9b8263852f0217157f9042b8e3dae7427ec739
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -344,7 +344,7 @@ F test/io.test 833a1746518ec3005aa7792f9bcb8f01923ff544
 F test/ioerr.test 32cff40562447bda194ba67ad601170edbaed49b
 F test/ioerr2.test b9c9a0491a812707762a7c002876553be54d9969
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
-F test/ioerr4.test 2bfe11c7ad030eec7d2d848f8d8ddeecb7279cb0
+F test/ioerr4.test fc6eddfec2efc2f1ed217b9eae4c1c1d3516ce86
 F test/join.test af0443185378b64878750aa1cf4b83c216f246b4
 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 530c6360610f737e85608b23ede2646d69d1bc9a
-R b3765e5e9b24b682270f8e36c5449957
-U danielk1977
-Z 58d2f3d9b823776050be08ba53db12b8
+P e98a7f87f91c62676f94ad5a0c4980ab929ca79d
+R 6e4a1bd41d61e00e4d5ba026c754e3a0
+U drh
+Z b62d7152b5cc18da370b950689f8f09f
diff --git a/manifest.uuid b/manifest.uuid
index f1bb64c6c7..99758744fe 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e98a7f87f91c62676f94ad5a0c4980ab929ca79d
\ No newline at end of file
+75df2d3d506abfa4aa4875fb533a5cd160b3f521
\ No newline at end of file
diff --git a/test/ioerr4.test b/test/ioerr4.test
index 576beff57d..3a74a88ae3 100644
--- a/test/ioerr4.test
+++ b/test/ioerr4.test
@@ -12,7 +12,7 @@
 # focus of this file is testing for correct handling of I/O errors
 # during incremental vacuum with a shared cache.
 #
-# $Id: ioerr4.test,v 1.1 2008/05/07 13:28:38 drh Exp $
+# $Id: ioerr4.test,v 1.2 2008/05/08 01:11:42 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -28,7 +28,7 @@ ifcapable {!shared_cache || !autovacuum} {
 #
 do_test ioerr4-1.1 {
   db close
-  sqlite3_enable_shared_cache 1
+  set ::enable_shared_cache [sqlite3_enable_shared_cache 1]
 } {0}
 do_test ioerr4-1.2 {
   file delete -force test.db test.db-journal
@@ -93,4 +93,8 @@ do_ioerr_test ioerr4-2 -tclprep {
   db eval {PRAGMA incremental_vacuum(5)}
 }
 
+db2 close
+file delete -force test.db-bu
+sqlite3_enable_shared_cache $::enable_shared_cache
+
 finish_test