From: shane <shane@noemail.net>
Date: Wed, 19 Aug 2009 04:24:48 +0000 (+0000)
Subject: Adjust sync count for SQLITE_DISABLE_DIRSYNC compiler option.
X-Git-Tag: fts3-refactor~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c53320320572a1cc69a4e0c6307f10e83791491;p=thirdparty%2Fsqlite.git

Adjust sync count for SQLITE_DISABLE_DIRSYNC compiler option.

FossilOrigin-Name: 709e16145e37940cb243eede75071fb15095d960
---

diff --git a/manifest b/manifest
index 4494e066c7..549bc68b6a 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Unknown\sfunctions\sin\sthe\sDEFAULT\sclause\sof\sa\stable\scause\san\serror\swhen\nthe\sDEFAULT\svalue\sis\sneeded.\s\sTicket\s[2d401a94287b5].
-D 2009-08-18T16:05:47
+C Adjust\ssync\scount\sfor\sSQLITE_DISABLE_DIRSYNC\scompiler\soption.
+D 2009-08-19T04:24:48
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -420,7 +417,7 @@ F test/insert4.test 6e382eaf7295a4463e6f29ea20fcd8e63d097eeb
 F test/insert5.test 1f93cbe9742110119133d7e8e3ccfe6d7c249766
 F test/interrupt.test 42e7cf98646fd9cb4a3b131a93ed3c50b9e149f1
 F test/intpkey.test 537669fd535f62632ca64828e435b9e54e8d677f
-F test/io.test ea9ac797949980c0f44cfa4591d7ca7377421c6a
+F test/io.test e7bd58edb4e2131a8ecd81b4b00af3ee5c79d464
 F test/ioerr.test 390785ec65f10aa58a82b048ee12e9052d783fa8
 F test/ioerr2.test 1b56cb80d5b0726ee3ba325ca175734541e32955
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
@@ -749,14 +746,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P 4e377a09c194e90581ef00fd3a213e936b4e648a
-R 106d1d9d8292feaff5d209c1b4f45eea
-U drh
-Z b419ed2a8ad50212ba01b76deb05691b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFKitFeoxKgR168RlERAoHVAJ4kYkqnImXF2E1lmnWXndOvcAnongCcDG/w
-uMdlFViYbHuGvwIqgTnxRjY=
-=T5a1
------END PGP SIGNATURE-----
+P 093917d7fda442012dfd1a1b2f20f85d2eefa093
+R bd2ad6ef6f8298aaa392cef396e66c78
+U shane
+Z 8a5e7a3b12f153b47f147ba40f17579d
diff --git a/manifest.uuid b/manifest.uuid
index 18fa660c97..c1a81268d2 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-093917d7fda442012dfd1a1b2f20f85d2eefa093
\ No newline at end of file
+709e16145e37940cb243eede75071fb15095d960
\ No newline at end of file
diff --git a/test/io.test b/test/io.test
index d9b7079381..3848affd8c 100644
--- a/test/io.test
+++ b/test/io.test
@@ -13,7 +13,6 @@
 # IO traffic generated by SQLite (making sure SQLite is not writing out
 # more database pages than it has to, stuff like that).
 #
-# $Id: io.test,v 1.21 2009/03/28 07:03:42 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -425,11 +424,13 @@ sqlite3_simulate_device -char safe_append
 # Normally, when the SAFE_APPEND flag is not set, there is another fsync()
 # on the journal file between steps (2) and (3) above.
 #
+set expected_sync_count 2
 if {$::tcl_platform(platform)=="unix"} {
-  set expected_sync_count 3
-} else {
-  set expected_sync_count 2
+  ifcapable dirsync {
+    incr expected_sync_count
+  }
 }
+
 do_test io-4.1 {
   execsql { DELETE FROM abc }
   nSync