From: drh Date: Fri, 11 May 2012 23:01:33 +0000 (+0000) Subject: Fix the wal2.test script so that it works on big-endian machines. X-Git-Tag: version-3.7.12~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=957ed0b3fe46ad3c06da8b7f16c4c506ef87c4fd;p=thirdparty%2Fsqlite.git Fix the wal2.test script so that it works on big-endian machines. FossilOrigin-Name: c4ab72f75090a420f73b85334b4c42a85af951a5 --- diff --git a/manifest b/manifest index c2c16f5412..7623967755 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sbug\sin\sthe\swal.test\sscript\sso\sthat\sit\sworks\son\sbig-endian\ssystems. -D 2012-05-11T20:43:47.467 +C Fix\sthe\swal2.test\sscript\sso\sthat\sit\sworks\son\sbig-endian\smachines. +D 2012-05-11T23:01:33.025 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -918,7 +918,7 @@ F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8 F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839 F test/wal.test b3d28d655371bf3f6500c679f526e9860544fe70 -F test/wal2.test 8871e7fd2c86711ff415a5817d68ea3101a15312 +F test/wal2.test d5021064bebfc717fe2bf4db2536ea030b76a773 F test/wal3.test 6504bbf348b2d6dfade64a064f1050fd617e8706 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c F test/wal5.test f58ed4b8b542f71c7441da12fbd769d99b362437 @@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 -P e68a3527decb434e8d0ac6b23a3cedba5992cedd -R a090b3c3a973af6805a2cab405f07118 +P 40fe9088fb73eee7b37b574a1dda422266a58638 +R 7ad1fd82b0af3b7e2debf294961f2147 U drh -Z 0f7a2e9e8b15e03cc250b2aa8f971bbe +Z f0bdb9ea9fcb27896d1034ea8e7a4479 diff --git a/manifest.uuid b/manifest.uuid index 7c22ccaef2..18cc470a32 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -40fe9088fb73eee7b37b574a1dda422266a58638 \ No newline at end of file +c4ab72f75090a420f73b85334b4c42a85af951a5 \ No newline at end of file diff --git a/test/wal2.test b/test/wal2.test index cbefb7ab1e..f30c0117f9 100644 --- a/test/wal2.test +++ b/test/wal2.test @@ -46,6 +46,7 @@ proc set_tvfs_hdr {file args} { } set blob [tvfs shm $file] + if {$::tcl_platform(byteOrder)=="bigEndian"} {set fmt I} {set fmt i} if {[llength $args]} { set ia [lindex $args 0] @@ -54,11 +55,11 @@ proc set_tvfs_hdr {file args} { set ib [lindex $args 1] } binary scan $blob a[expr $nHdr*2]a* dummy tail - set blob [binary format i${nInt}i${nInt}a* $ia $ib $tail] + set blob [binary format ${fmt}${nInt}${fmt}${nInt}a* $ia $ib $tail] tvfs shm $file $blob } - binary scan $blob i${nInt} ints + binary scan $blob ${fmt}${nInt} ints return $ints }