Fix a test case so that it (hopefully) works on x86-64. Ticket #2465. (CVS 4134)

FossilOrigin-Name: 3daf7cae18ae2ee6404f770e69e4cd0c715615e5

diff --git a/manifest b/manifest
index 8116f3c5a851bbff10e3db9c57e8e261b8d079b5..70de6155ea8b2e6dc624417b3084ce59d1d48e21 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\svestigal\scode\sfrom\sMakefile.linux-gcc.\s\sTicket\s#2466.\s(CVS\s4133)
-D 2007-06-26T22:10:12
+C Fix\sa\stest\scase\sso\sthat\sit\s(hopefully)\sworks\son\sx86-64.\s\sTicket\s#2465.\s(CVS\s4134)
+D 2007-06-26T22:42:56
 F Makefile.in 7f7485a4cc039476a42e534b3f26ec90e2f9753e
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -411,7 +411,7 @@ F test/trigger7.test 0afa870be2ce1b132cdb85b17a4a4ef45aa8cece
 F test/trigger8.test 3a09275aa2214fdff56f731b1e775d8dfee4408a
 F test/types.test 98e7a631bddf0806204358b452b02d0e319318a6
 F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
-F test/types3.test c08b2b960064be30f5237cd2cf4680f32ba190be
+F test/types3.test b730a7db03ef69f0fdb85b2addc20d1a0a04039b
 F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
 F test/update.test 7669ca789d62c258b678e8aa7a22a57eac10f2cf
 F test/utf16.test 20e2d9ba0d57e952a18b1ac8deab9ad49e082893
@@ -516,7 +516,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P b331e30395e9fc90abe40ab802972a67648cf48e
-R df414bc849f1ed27e2dc319f55de48c7
+P 338c18791006bac3709410087316700aad3b332f
+R 76fa6fff3d8e3f760dede2f083ada376
 U drh
-Z 78ad048e1d849654b6f1b7ae374a472e
+Z ebf4030b9dc2f802dc6698d6e014be81

diff --git a/manifest.uuid b/manifest.uuid
index ae50a45b07885dbefdaee2d7ff4ae5a98ecb9fa7..f6ad8d96652ed083110ebc821c7685f155ac370a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-338c18791006bac3709410087316700aad3b332f
\ No newline at end of file
+3daf7cae18ae2ee6404f770e69e4cd0c715615e5
\ No newline at end of file

diff --git a/test/types3.test b/test/types3.test
index 78bbca50d9d26faf236ee71c8ac54aa81ae3466c..3d48ad8506d1b7e7c5699f97a0efa0ba7bff34de 100644 (file)
--- a/test/types3.test
+++ b/test/types3.test
@@ -12,7 +12,7 @@
 # of this file is testing the interaction of SQLite manifest types
 # with Tcl dual-representations.
 #
-# $Id: types3.test,v 1.6 2007/05/03 16:31:26 danielk1977 Exp $
+# $Id: types3.test,v 1.7 2007/06/26 22:42:56 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -30,10 +30,18 @@ do_test types3-1.2 {
   set V [expr {int(1+2)}]
   concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
 } {int integer}
-do_test types3-1.3 {
-  set V [expr {1+123456789012345}]
-  concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
-} {wideInt integer}
+set V [expr {1+12345678012345}]
+if {[tcl_variable_type V]=="wideInt"} {
+  do_test types3-1.3 {
+    set V [expr {1+123456789012345}]
+    concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
+  } {wideInt integer}
+} else {
+  do_test types3-1.3 {
+    set V [expr {1+123456789012345}]
+    concat [tcl_variable_type V] [execsql {SELECT typeof(:V)}]
+  } {int integer}
+}
 
 # A double variable comes in as REAL
 do_test types3-1.4 {