Updates to test code in os_win to bring winSync inline with unixSync (test code only).

Updated a few test scripts to account for dirsync counting issues on Windows.

FossilOrigin-Name: 8f99c5bf639ee4f6384cc3c2d7f056d1b08e4f16

diff --git a/manifest b/manifest
index c066fda2663bc7fa139b05ddf01e9420ac41c3a5..3a1af9774bdc9a82a25338b8b46bba3e0bcfbb2e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sstray\ssemi-colon\sthat\sMSVC\scomplained\sabout.
-D 2011-04-15T19:30:42.292
+C Updates\sto\stest\scode\sin\sos_win\sto\sbring\swinSync\sinline\swith\sunixSync\s(test\scode\sonly).\s\s\nUpdated\sa\sfew\stest\sscripts\sto\saccount\sfor\sdirsync\scounting\sissues\son\sWindows.
+D 2011-04-15T20:18:40.626
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
 F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c c80e9d427c9c44c6a26f5233c14c14550e8c05c1
-F src/os_win.c 177a14a0690e072534749b5950034d0177bb26d6
+F src/os_win.c d149b9a7dfdd38de09afc054f8168cd3cd80630b
 F src/pager.c 055239dcdfe12b3f5d97f6f01f85da01e2d6d912
 F src/pager.h 3f8c783de1d4706b40b1ac15b64f5f896bcc78d1
 F src/parse.y 12b7ebd61ea54f0e1b1083ff69cc2c8ce9353d58
@@ -677,7 +677,7 @@ F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
 F test/superlock.test 5d7a4954b0059c903f82c7b67867bc5451a7c082
-F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
+F test/sync.test 2bd73b585089c99e76b3e1796c42059b7d89d872
 F test/syscall.test 707c95e4ab7863e13f1293c6b0c76bead30249b3
 F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f
 F test/table.test 04ba066432430657712d167ebf28080fe878d305
@@ -863,7 +863,7 @@ F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
 F test/wal.test 5617ad308bfdb8a8885220d8a261a6096a8d7e57
-F test/wal2.test e561a8c6fdd1c2cd1876f3e39757934e7b7361f8
+F test/wal2.test aa0fb2314b3235be4503c06873e41ebfc0757782
 F test/wal3.test 5c396cc22497244d627306f4c1d360167353f8dd
 F test/wal4.test 3404b048fa5e10605facaf70384e6d2943412e30
 F test/wal5.test 1bbfaa316dc2a1d0d1fac3f4500c38a90055a41b
@@ -929,7 +929,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 4e33a0eaf83922926f8d5ee988a20439a09bc795
-R 1de3aeee08a0a0eaf4ebc036e17c7731
+P 7a085271ff85033479c2057c19a45a750168d228
+R b019ee7da23373414d9e5d588525e6d9
 U shaneh
-Z 5caf2116092f11c160fc67dc57f30878
+Z 81dc3f84502183f758b229c7fc470375

diff --git a/manifest.uuid b/manifest.uuid
index a6411ae2991901d0bc3d8480e661d022da342a5a..17252d104eda553dd99b6f3b765ba11eec3b4ad9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7a085271ff85033479c2057c19a45a750168d228
\ No newline at end of file
+8f99c5bf639ee4f6384cc3c2d7f056d1b08e4f16
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index e97c5ff0816d67867d5b72d122b0afb883e21615..654a964468068f5af04ef211ad043850bef1fba6 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -934,6 +934,7 @@ int sqlite3_fullsync_count = 0;
 static int winSync(sqlite3_file *id, int flags){
 #if !defined(NDEBUG) || !defined(SQLITE_NO_SYNC) || defined(SQLITE_DEBUG)
   winFile *pFile = (winFile*)id;
+  BOOL rc;
 #else
   UNUSED_PARAMETER(id);
 #endif
@@ -946,28 +947,29 @@ static int winSync(sqlite3_file *id, int flags){
 
   OSTRACE(("SYNC %d lock=%d\n", pFile->h, pFile->locktype));
 
+  /* Unix cannot, but some systems may return SQLITE_FULL from here. This
+  ** line is to test that doing so does not cause any problems.
+  */
+  SimulateDiskfullError( return SQLITE_FULL );
+
 #ifndef SQLITE_TEST
   UNUSED_PARAMETER(flags);
 #else
-  if( flags & SQLITE_SYNC_FULL ){
+  if( (flags&0x0F)==SQLITE_SYNC_FULL ){
     sqlite3_fullsync_count++;
   }
   sqlite3_sync_count++;
 #endif
 
-  /* Unix cannot, but some systems may return SQLITE_FULL from here. This
-  ** line is to test that doing so does not cause any problems.
-  */
-  SimulateDiskfullError( return SQLITE_FULL );
-  SimulateIOError( return SQLITE_IOERR; );
-
   /* If we compiled with the SQLITE_NO_SYNC flag, then syncing is a
   ** no-op
   */
 #ifdef SQLITE_NO_SYNC
   return SQLITE_OK;
 #else
-  if( FlushFileBuffers(pFile->h) ){
+  rc = FlushFileBuffers(pFile->h);
+  SimulateIOError( rc=FALSE );
+  if( rc ){
     return SQLITE_OK;
   }else{
     pFile->lastErrno = GetLastError();

diff --git a/test/sync.test b/test/sync.test
index 98aa7731e7ddcbfe949a93ed369d012a58bc2455..4b02ad72abc75e7802f771f25219bd1f18c1007c 100644 (file)
--- a/test/sync.test
+++ b/test/sync.test
@@ -19,19 +19,27 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 #
-# These tests are only applicable on unix when pager pragma are
+# These tests are only applicable when pager pragma are
 # enabled. Also, since every test uses an ATTACHed database, they
 # are only run when ATTACH is enabled.
 #
-if {$::tcl_platform(platform)!="unix"} {
-  finish_test
-  return
-}
 ifcapable !pager_pragmas||!attach {
   finish_test
   return
 }
 
+set sqlite_sync_count 0
+proc cond_incr_sync_count {adj} {
+  global sqlite_sync_count
+  if {$::tcl_platform(platform) == "windows"} {
+    incr sqlite_sync_count $adj
+  } {
+    ifcapable !dirsync {
+      incr sqlite_sync_count $adj
+    }
+  }
+}
+
 do_test sync-1.1 {
   set sqlite_sync_count 0
   file delete -force test2.db
@@ -42,9 +50,7 @@ do_test sync-1.1 {
     ATTACH DATABASE 'test2.db' AS db2;
     CREATE TABLE db2.t2(x,y);
   }
-  ifcapable !dirsync {
-    incr sqlite_sync_count 2
-  }
+  cond_incr_sync_count 2
   set sqlite_sync_count
 } 8
 ifcapable pager_pragmas {
@@ -58,9 +64,7 @@ ifcapable pager_pragmas {
       INSERT INTO t2 VALUES(3,4);
       COMMIT;
     }
-    ifcapable !dirsync {
-      incr sqlite_sync_count 3
-    }
+    cond_incr_sync_count 3
     set sqlite_sync_count
   } 8
 }
@@ -74,9 +78,7 @@ do_test sync-1.3 {
     INSERT INTO t2 VALUES(5,6);
     COMMIT;
   }
-  ifcapable !dirsync {
-    incr sqlite_sync_count 3
-  }
+  cond_incr_sync_count 3
   set sqlite_sync_count
 } 10
 ifcapable pager_pragmas {

diff --git a/test/wal2.test b/test/wal2.test
index 82234330fadcd12baec9acb9eeb7b64f5d30a53e..97966cd94e7a2fae086e42b57866d83cc25a59c7 100644 (file)
--- a/test/wal2.test
+++ b/test/wal2.test
@@ -23,6 +23,18 @@ set testprefix wal2
 
 ifcapable !wal {finish_test ; return }
 
+set sqlite_sync_count 0
+proc cond_incr_sync_count {adj} {
+  global sqlite_sync_count
+  if {$::tcl_platform(platform) == "windows"} {
+    incr sqlite_sync_count $adj
+  } {
+    ifcapable !dirsync {
+      incr sqlite_sync_count $adj
+    }
+  }
+}
+
 proc set_tvfs_hdr {file args} {
 
   # Set $nHdr to the number of bytes in the wal-index header:
@@ -1189,6 +1201,7 @@ foreach {tn sql reslist} {
   } {10 0 5 5 0 2 2}
 
   do_test wal2-14.$tn.3 {
+    cond_incr_sync_count 1
     list $sqlite_sync_count $sqlite_fullsync_count
   } [lrange $reslist 0 1]