Updates for to WAL TCL test scripts to support running on Windows.

FossilOrigin-Name: 6a5630806c87b0f4e5632c37c357f98effd9608a

diff --git a/manifest b/manifest
index 5cdf879263e35b89dc0c0f0ef6cd08b550309e8e..332497bed4c6f2adc5aa5c83685209e57a06ea97 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Fix\san\soff-by-one\serror\swhile\sconstructing\sthe\sname\sof\sthe\smmap\sfile\sfor\nthe\swal-index\sunder\sos_unix.c.
-D 2010-05-10T19:51:33
+C Updates\sfor\sto\sWAL\sTCL\stest\sscripts\sto\ssupport\srunning\son\sWindows.
+D 2010-05-11T02:46:17
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -764,13 +761,13 @@ F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
-F test/wal.test de63d85e221757dbf0df58b0a96a435721b6c9d4
+F test/wal.test 7a100918c45872fa19cfb4413299b9afb08727b6
 F test/wal2.test 0f53c711d6530d3c7aba46752aef9fd44b708c6c
 F test/walbak.test a0e45187c7d8928df035dfea29b99b016b21ca3c
 F test/walcrash.test f6d5fb2bb108876f04848720a488065d9deef69f
-F test/walfault.test bff34172bc224360d9c0d6c7b94454817c8def9d
+F test/walfault.test 98df47444944a6db2161eed5cef71d6c00bcb8c3
 F test/walhook.test c3314e30baf074dd087d52d21ea6f1d09138b0a0
-F test/walmode.test bac6f06544a8554588a1543def996bbe2fc41792
+F test/walmode.test 6ca9d710cc9f6545b913abcded6d6b0b15641048
 F test/walslow.test d21625e2e99e11c032ce949e8a94661576548933
 F test/walthread.test 1a8c55cd9e3272ba0caa028d8f0ead04989a3378
 F test/where.test de337a3fe0a459ec7c93db16a519657a90552330
@@ -816,14 +813,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P c67756c404669141fa06a1ce3f1efadefa277bc6
-R a32c835dc9b43b32dcafe3e3af944d60
-U drh
-Z 3ba54b43517c1555d6a58b385aeeda6a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFL6GPIoxKgR168RlERAvgHAJ4mrKDkzo8GJO2fKoAPudvDpTqQZgCfeiBD
-rtdc++T8qeWjlXhi4ufBbL8=
-=5REM
------END PGP SIGNATURE-----
+P 6e3735f72cb7d2f4d16c8f9bc59ff159c75243e5
+R 6271f8fbb605ce59c9bcaa6c5c92af66
+U shaneh
+Z 6c6a591f5b1ea69fe4a6d39da0e8aca9

diff --git a/manifest.uuid b/manifest.uuid
index 72f5d9aff952de045d8e15a408e1c9ad1df643af..a244475a7b8fe347db22bc24dd67d91f6a2a907d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6e3735f72cb7d2f4d16c8f9bc59ff159c75243e5
\ No newline at end of file
+6a5630806c87b0f4e5632c37c357f98effd9608a
\ No newline at end of file

diff --git a/test/wal.test b/test/wal.test
index 074384f9bc3ca568ce81adbf684bb483fba982fa..fd40ad4fd05cd8c0a30a46377b65a48f21f4faf5 100644 (file)
--- a/test/wal.test
+++ b/test/wal.test
@@ -1285,8 +1285,9 @@ proc logcksum {ckv1 ckv2 blob} {
   upvar $ckv1 c1
   upvar $ckv2 c2
 
-  binary scan $blob iu* values
+  binary scan $blob i* values
   foreach v $values {
+    set v [expr {$v & 0xFFFFFFFF}]
     incr c1 $v
     incr c2 $c1
   }
@@ -1427,6 +1428,7 @@ do_test wal-19.4 {
 # file in step 3 and the checkpoint was corrupting the database file.
 #
 do_test wal-20.1 {
+  catch {db close}
   file delete -force test.db test.db-wal test.db-journal
   sqlite3 db test.db
   execsql {

diff --git a/test/walfault.test b/test/walfault.test
index aa8a4ef91b8db84215f71c6215571fcf959b1231..e542e11281664932a4e91697c130489a9f0b1705 100644 (file)
--- a/test/walfault.test
+++ b/test/walfault.test
@@ -61,6 +61,7 @@ do_ioerr_test walfault-ioerr-1 -sqlprep {
   DELETE FROM abc;
   PRAGMA wal_checkpoint;
 }
+catch {db close}
 
 # A [testvfs] callback for the VFS created by [do_shmfault_test]. This
 # callback injects SQLITE_IOERR faults into methods for which an entry

diff --git a/test/walmode.test b/test/walmode.test
index a19a04efc2c9042d41089558ab17a89dfc6c6024..714e0d81893b37c49d023432c1d70ca943518260 100644 (file)
--- a/test/walmode.test
+++ b/test/walmode.test
@@ -43,9 +43,17 @@ do_test walmode-1.1 {
 do_test walmode-1.2 {
   file size test.db
 } {1024}
+
+set expected_sync_count 3
+if {$::tcl_platform(platform)!="windows"} {
+  ifcapable dirsync {
+    incr expected_sync_count
+  }
+}
 do_test walmode-1.3 {
   set sqlite_sync_count
-} {4}
+} $expected_sync_count
+
 do_test walmode-1.4 {
   file exists test.db-wal
 } {0}