From: shane <shane@noemail.net>
Date: Fri, 26 Jun 2009 14:17:47 +0000 (+0000)
Subject: Skip a couple tests requiring working 64bit int support on platforms without that... 
X-Git-Tag: cvs-to-fossil-cutover~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=389ae2c52d12b549699802b955bf147a09457c64;p=thirdparty%2Fsqlite.git

Skip a couple tests requiring working 64bit int support on platforms without that support.  Test code change only. (CVS 6823)

FossilOrigin-Name: d8c8145c9d28d014eb9218b3f1312b957ccc72b7
---

diff --git a/manifest b/manifest
index a85e50464c..596b310d26 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\ssqlite3VdbeAddOp()\sfails\sdue\sto\san\sOOM\sfault,\sreturn\san\saddress\sof\s1\nrather\sthan\szero\sso\sthat\sthere\sappears\sto\salways\sbe\sa\sprior\sinstruction.\nThis\sprevents\sa\snegative\sjump-to\saddress\scomputation\sin\swhere.c\sfollowing\nan\sOOM\sfault.\s(CVS\s6822)
-D 2009-06-26T14:04:51
+C Skip\sa\scouple\stests\srequiring\sworking\s64bit\sint\ssupport\son\splatforms\swithout\sthat\ssupport.\s\sTest\scode\schange\sonly.\s(CVS\s6823)
+D 2009-06-26T14:17:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 8b8fb7823264331210cddf103831816c286ba446
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -654,7 +654,7 @@ F test/tkt3871.test 43ecbc8d90dc83908e2a454aef345acc9d160c6f
 F test/tkt3879.test 2ad5bef2c87e9991ce941e054c31abe26ef7fb90
 F test/tkt3911.test 74cd324f3ba653040cc6d94cc4857b290d12d633
 F test/tkt3918.test e6cdf6bfcfe9ba939d86a4238a9dc55d6eec5d42
-F test/tkt3922.test 0b43815bff3b6ab889bf84a17668ee13ab046bfd
+F test/tkt3922.test 022ace32c049e3964f68492c12eb803e8e4856d8
 F test/tkt3929.test 6a4c3baefb4e75127356b7d675b5df42c35c00d1
 F test/tokenize.test ce430a7aed48fc98301611429595883fdfcab5d7
 F test/trace.test 19ffbc09885c3321d56358a5738feae8587fb377
@@ -737,7 +737,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746
-P a52ef5a4216f26c617bd1471cd19f3da2a6d2c4c
-R 7c553912f88d2576d87919ca301ee243
-U drh
-Z 54e939e48b5dd1bf7f258c6a78252ee4
+P fe02339cb2f61c1e8a356e2d0ce9c3aef6e6cd8d
+R 92cc4c02fcd24b5a032b486d8397232b
+U shane
+Z 87a80b68d62d7270dfc0ea1f6aa7e44a
diff --git a/manifest.uuid b/manifest.uuid
index f50a384652..bdcbad9136 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fe02339cb2f61c1e8a356e2d0ce9c3aef6e6cd8d
\ No newline at end of file
+d8c8145c9d28d014eb9218b3f1312b957ccc72b7
\ No newline at end of file
diff --git a/test/tkt3922.test b/test/tkt3922.test
index ecf7fa1c50..6506dcedb7 100644
--- a/test/tkt3922.test
+++ b/test/tkt3922.test
@@ -9,18 +9,33 @@
 #
 #***********************************************************************
 #
-# $Id: tkt3922.test,v 1.1 2009/06/17 16:20:04 drh Exp $
+# $Id: tkt3922.test,v 1.2 2009/06/26 14:17:47 shane Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-do_test tkt3922.1 {
-  execsql {
-    CREATE TABLE t1(a NUMBER);
-    INSERT INTO t1 VALUES('-9223372036854775808');
-    SELECT a, typeof(a) FROM t1;
-  }
-} {-9223372036854775808 integer}
+if {[working_64bit_int]} {
+  do_test tkt3922.1 {
+    execsql {
+      CREATE TABLE t1(a NUMBER);
+      INSERT INTO t1 VALUES('-9223372036854775808');
+      SELECT a, typeof(a) FROM t1;
+    }
+  } {-9223372036854775808 integer}
+} else {
+  # this alternate version of tkt3922.1 doesn't
+  # really test the same thing as the original, 
+  # but is needed to create the table and 
+  # provided simply as a place holder for 
+  # platforms without working 64bit support.
+  do_test tkt3922.1 {
+    execsql {
+      CREATE TABLE t1(a NUMBER);
+      INSERT INTO t1 VALUES('-1');
+      SELECT a, typeof(a) FROM t1;
+    }
+  } {-1 integer}
+}
 do_test tkt3922.2 {
   execsql {
     DELETE FROM t1;
@@ -42,13 +57,27 @@ do_test tkt3922.4 {
     SELECT a, typeof(a) FROM t1;
   }
 } {-9.22337203685478e+18 real}
-do_test tkt3922.5 {
-  execsql {
-    DELETE FROM t1;
-    INSERT INTO t1 VALUES('9223372036854775807');
-    SELECT a, typeof(a) FROM t1;
-  }
-} {9223372036854775807 integer}
+if {[working_64bit_int]} {
+  do_test tkt3922.5 {
+    execsql {
+      DELETE FROM t1;
+      INSERT INTO t1 VALUES('9223372036854775807');
+      SELECT a, typeof(a) FROM t1;
+    }
+  } {9223372036854775807 integer}
+} else {
+  # this alternate version of tkt3922.5 doesn't
+  # really test the same thing as the original, 
+  # but provided simply as a place holder for 
+  # platforms without working 64bit support.
+  do_test tkt3922.5 {
+    execsql {
+      DELETE FROM t1;
+      INSERT INTO t1 VALUES('1');
+      SELECT a, typeof(a) FROM t1;
+    }
+  } {1 integer}
+}
 do_test tkt3922.6 {
   execsql {
     DELETE FROM t1;