Trying to get some tests in printf.test to pass on 64-bit systems. (CVS 1952)

FossilOrigin-Name: b12fc46dcd5aa901fc781a17d49f8f110fed5b8d

diff --git a/manifest b/manifest
index fa593252f74ac71ee4d88d94fb9f4fc2211c7975..39c4a2e93bb251b82b5e962931753e00a1c68c63 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\smakefile\sso\sthat\sutil.c\sgets\sthe\s-DSQLITE_DEBUG=1\sflag\swhen\nbuilding\sthe\stest\sfixture.\s(CVS\s1951)
-D 2004-09-08T21:12:50
+C Trying\sto\sget\ssome\stests\sin\sprintf.test\sto\spass\son\s64-bit\ssystems.\s(CVS\s1952)
+D 2004-09-09T00:35:30
 F Makefile.in 7f481bb8cdb032491df611526e6f4eb6af79691d
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -153,7 +153,7 @@ F test/pager2.test 2b505eca6bf214dfff412cf615678a835c83ca74
 F test/pager3.test 16f546293bb751b8151dc17df613fca938bbec8b
 F test/pagesize.test f8b46ec46b9fe9f708a8d757dda232588dfb7217
 F test/pragma.test 66a66b7f3b273b93325c9a5794acb418f52fdcbf
-F test/printf.test 5a30fb0d736148fca64cb1b7ed0390be7414e024
+F test/printf.test 92ba4c510b4fc61120ffa4a01820446ed917ae57
 F test/progress.test 76c722f090b1ccb575e7e4e203a71608c5763beb x
 F test/quick.test 212a9cd4c40c72c7c4780fef1c2fbe5d1cb34ce6
 F test/quote.test 6d75cf635d93ba2484dc9cb378d88cbae9dc2c62
@@ -248,7 +248,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 5a3f823c1430376ed127d627d408ab284815c1a4
-R 297ecada65ad27191ae6f0d42e4f3bb3
+P 8d0c9a8d94930056817a99d9504e804a200eda73
+R fa16565e97b0b79526316711808f2881
 U drh
-Z 8dd5ebabab6ec7e3d2fa2d8075f23b85
+Z 3b34ac8e9ed662e375ce442bf1156fe9

diff --git a/manifest.uuid b/manifest.uuid
index ca3b8579a394b582d20c4904f7fe6c338e2d792d..a9422adb1be4eaa47f752c5d6e84522de80a0e32 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8d0c9a8d94930056817a99d9504e804a200eda73
\ No newline at end of file
+b12fc46dcd5aa901fc781a17d49f8f110fed5b8d
\ No newline at end of file

diff --git a/test/printf.test b/test/printf.test
index 62f6443e714ebc59a86aef4a524429a4d41b21b4..ecaef37fa1748e0e282e08429a88ae17c68463ef 100644 (file)
--- a/test/printf.test
+++ b/test/printf.test
@@ -11,34 +11,35 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the sqlite_*_printf() interface.
 #
-# $Id: printf.test,v 1.13 2004/07/27 13:38:48 drh Exp $
+# $Id: printf.test,v 1.14 2004/09/09 00:35:30 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
 set n 1
 foreach v {1 2 5 10 99 100 1000000 999999999 0 -1 -2 -5 -10 -99 -100 -9999999} {
+  set v32 [expr {$v&0xffffffff}]
   do_test printf-1.$n.1 [subst {
     sqlite3_mprintf_int {Three integers: %d %x %o} $v $v $v
-  }] [format {Three integers: %d %x %o} $v $v $v]
+  }] [format {Three integers: %d %x %o} $v $v32 $v32]
   do_test printf-1.$n.2 [subst {
     sqlite3_mprintf_int {Three integers: (%6d) (%6x) (%6o)} $v $v $v
-  }] [format {Three integers: (%6d) (%6x) (%6o)} $v $v $v]
+  }] [format {Three integers: (%6d) (%6x) (%6o)} $v $v32 $v32]
   do_test printf-1.$n.3 [subst {
     sqlite3_mprintf_int {Three integers: (%-6d) (%-6x) (%-6o)} $v $v $v
-  }] [format {Three integers: (%-6d) (%-6x) (%-6o)} $v $v $v]
+  }] [format {Three integers: (%-6d) (%-6x) (%-6o)} $v $v32 $v32]
   do_test printf-1.$n.4 [subst {
     sqlite3_mprintf_int {Three integers: (%+6d) (%+6x) (%+6o)} $v $v $v
-  }] [format {Three integers: (%+6d) (%+6x) (%+6o)} $v $v $v]
+  }] [format {Three integers: (%+6d) (%+6x) (%+6o)} $v $v32 $v32]
   do_test printf-1.$n.5 [subst {
     sqlite3_mprintf_int {Three integers: (%06d) (%06x) (%06o)} $v $v $v
-  }] [format {Three integers: (%06d) (%06x) (%06o)} $v $v $v]
+  }] [format {Three integers: (%06d) (%06x) (%06o)} $v $v32 $v32]
   do_test printf-1.$n.6 [subst {
     sqlite3_mprintf_int {Three integers: (% 6d) (% 6x) (% 6o)} $v $v $v
-  }] [format {Three integers: (% 6d) (% 6x) (% 6o)} $v $v $v]
+  }] [format {Three integers: (% 6d) (% 6x) (% 6o)} $v $v32 $v32]
   do_test printf-1.$n.7 [subst {
     sqlite3_mprintf_int {Three integers: (%#6d) (%#6x) (%#6o)} $v $v $v
-  }] [format {Three integers: (%#6d) (%#6x) (%#6o)} $v $v $v]
+  }] [format {Three integers: (%#6d) (%#6x) (%#6o)} $v $v32 $v32]
   incr n
 }