Use the hexio test utility rather than TCL's binary I/O to avoid

32/64-bit problems in io.test.  Ticket #2803.  (This is a change
to the test harness only - not to SQLite.) (CVS 4571)

FossilOrigin-Name: 07f7dde8a636aa05b917daa6b248c6f98654aab8

diff --git a/manifest b/manifest
index d934b5429e3f8395c569b6f2e375b89fd8bdacd6..568140daa5cc3b83cb1e5f8d0e3fe8014c85b5e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\ssuperfluous\s-lpthread\sfrom\spublish_osx.sh.\sTicket\s#2801.\nFix\sa\sbug\sin\smkdll.sh.\s(CVS\s4570)
-D 2007-11-27T21:44:30
+C Use\sthe\shexio\stest\sutility\srather\sthan\sTCL's\sbinary\sI/O\sto\savoid\n32/64-bit\sproblems\sin\sio.test.\s\sTicket\s#2803.\s\s(This\sis\sa\schange\nto\sthe\stest\sharness\sonly\s-\snot\sto\sSQLite.)\s(CVS\s4571)
+D 2007-11-27T23:11:45
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 35396fd58890420b29edcf27b6c0e2d054862a6b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -336,7 +336,7 @@ F test/insert4.test 6919ddacd79c2cfeb9785b0f84217f9cb14853b5
 F test/insert5.test e8d5ba31283db5b0315ada9774dd99b6e9fe2122
 F test/interrupt.test 81555fb0f8179bb2d0dc7151fd75428223f93cf2
 F test/intpkey.test af4fd826c4784ec5c93b444de07adea0254d0d30
-F test/io.test 835b0ec66166312ff743e2fd11a878c65068de9f
+F test/io.test 80a7a7f1a2792e037d447b03e8c22ee1f6eaf339
 F test/ioerr.test ae429185a3a11a318aa7ec64e2188e6119e43bca
 F test/ioerr2.test e3d52c40f43f9b61da9b38951a737e7b84ebae96
 F test/join.test af0443185378b64878750aa1cf4b83c216f246b4
@@ -593,7 +593,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 4f09f233f0603696aac80f1a4f86bcc803a00daf
-R 3be5fb77281a8e7163111b23a1f8b7d1
+P 8d6e8fd381d26b9f14464f545c37363218206391
+R 06c20329a63cf714616c5a4f6d4f7b29
 U drh
-Z 1771ab6251ed57e44bbb1065a231547d
+Z 1fd27d5d1474b3f357c5293f3106001a

diff --git a/manifest.uuid b/manifest.uuid
index b165a8380c7d4894765ec3d69f758c1738c43b92..aa2463b31fb64e58acb015588e043ceab0042386 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d6e8fd381d26b9f14464f545c37363218206391
\ No newline at end of file
+07f7dde8a636aa05b917daa6b248c6f98654aab8
\ No newline at end of file

diff --git a/test/io.test b/test/io.test
index 398a76538de1a7ee0a62b21e0b64daee34f04698..297ccf9bfc26d041e8a40288233e235068f66e5e 100644 (file)
--- a/test/io.test
+++ b/test/io.test
@@ -13,7 +13,7 @@
 # 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.12 2007/10/09 08:29:32 danielk1977 Exp $
+# $Id: io.test,v 1.13 2007/11/27 23:11:45 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -443,14 +443,8 @@ do_test io-4.2.1 {
 } {1}
 if {$::tcl_platform(platform)=="unix"} {
   do_test io-4.2.2 {
-    set fd [open test.db-journal]
-    fconfigure $fd -translation binary -encoding binary
-    seek $fd 8
-    set blob [read $fd 4]
-    close $fd
-    binary scan $blob i res
-    format 0x%X $res
-  } {0xFFFFFFFF}
+    hexio_read test.db-journal 8 4
+  } {FFFFFFFF}
 }
 do_test io-4.2.3 {
   execsql { COMMIT }