i

i
Minor changes to checksum related test cases.

FossilOrigin-Name: 60c22bde52121993d4bea11eef38ab285c737e2c

diff --git a/manifest b/manifest
index 87e4c8efe4b9200e5a6b19f03fce24eb8eba7308..658d170ba80636eb6e5d710f4646e9fdc0ef17aa 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sa\stest\sto\swalcksum.test\sto\sstress\sthe\schecksum\scalculation.
-D 2010-05-28T04:16:28
+C i\ni\nMinor\schanges\sto\schecksum\srelated\stest\scases.
+D 2010-05-29T06:18:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -762,9 +762,9 @@ F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
 F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
 F test/wal.test be8ef043253ca735ffcabb92a7dac2d79ebfe8c1
-F test/wal2.test a10f52b403117c2b9a1f7a11db527c53bb684a25
+F test/wal2.test c58bb5b2fac48b8393909038ced730df5ad973b0
 F test/walbak.test e7650a26eb4b8abeca9b145b1af1e63026dde432
-F test/walcksum.test a710d2c5c3f4e786d37d099790d8df8c47e270a3
+F test/walcksum.test 4efa8fb88c32bed8288ea4385a9cc113a5c8f0bf
 F test/walcrash.test f6d5fb2bb108876f04848720a488065d9deef69f
 F test/walcrash2.test 14585ad1a2c85da2de721caa3b4deeea55213008
 F test/walfault.test f71d4c9a13d4e27086aef55f1e0e94734ffa2f6a
@@ -815,7 +815,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 42705babba0e9d2ef078845854bebbd168f23366
-R 9d2a3bc8fc2778c92116dc9b4d28847f
+P 778d0c1768f73057be912793631e0cf0575858fb
+R 3de33148905a50194902720ee6b775bd
 U dan
-Z 0d53d36af3414df9e04c32dec264ddf0
+Z b74577b9b52063fe6c9dd6e69ac9a2e9

diff --git a/manifest.uuid b/manifest.uuid
index c98509d9395ae24f2629d48ac45d50d42bba1845..689008420cf5ba4989f3e2642b0889f16b83c9a8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-778d0c1768f73057be912793631e0cf0575858fb
\ No newline at end of file
+60c22bde52121993d4bea11eef38ab285c737e2c
\ No newline at end of file

diff --git a/test/wal2.test b/test/wal2.test
index c4cad3c8a1143eabe14a51f17c53ce3582060218..4fe9165f81ab294835bc75ff57b8d4ca3f36d4cd 100644 (file)
--- a/test/wal2.test
+++ b/test/wal2.test
@@ -30,9 +30,9 @@ proc set_tvfs_hdr {file args} {
 
   set blob [tvfs shm $file]
   if {[llength $args]} {
-    set blob [
-      binary format i${nInt}a* [lindex $args 0] [string range $blob $nHdr end]
-    ]
+    set ia [lindex $args 0]
+    set tail [string range $blob [expr $nHdr*2] end]
+    set blob [binary format i${nInt}i${nInt}a* $ia $ia $tail]
     tvfs shm $file $blob
   }
 
@@ -101,7 +101,9 @@ foreach {tn iInsert res wal_index_hdr_mod wal_locks} {
          7   10   {10 55}   5             {READ RECOVER READ UNLOCK}
          8   11   {11 66}   6             {READ RECOVER READ UNLOCK}
          9   12   {12 78}   7             {READ RECOVER READ UNLOCK}
-        10   13   {13 91}   -1            {READ UNLOCK}
+        10   13   {13 91}   8             {READ RECOVER READ UNLOCK}
+        11   14   {14 105}  9             {READ RECOVER READ UNLOCK}
+        12   15   {15 120}  -1            {READ UNLOCK}
 } {
 
   do_test wal2-1.$tn.1 {

diff --git a/test/walcksum.test b/test/walcksum.test
index 0cded894ebe881ad234c7cc8ac80242219b09790..0d15bc050e22f37013fa2c0350410a7391f4b8f2 100644 (file)
--- a/test/walcksum.test
+++ b/test/walcksum.test
@@ -360,7 +360,9 @@ do_test walcksum-3.2 {
 } {1 2 3}
 db2 close
 file copy -force test.db test2.db
-for {set incr 1} {$incr <= 255} {incr incr 21} {
+
+
+foreach incr {1 2 3 20 40 60 80 100 120 140 160 180 200 220 240 253 254 255} {
   do_test walcksum-3.3.$incr {
     set FAIL 0
     for {set iOff 0} {$iOff < [log_file_size 1 1024]} {incr iOff} {
@@ -373,7 +375,7 @@ for {set incr 1} {$incr <= 255} {incr incr 21} {
       seek $fd $iOff
       binary scan [read $fd 1] c x
       seek $fd $iOff
-      puts -nonewline $fd [binary format c [expr {$x+$incr}]]
+      puts -nonewline $fd [binary format c [expr {($x+$incr)&0xFF}]]
       close $fd
     
       sqlite3 db2 test2.db