Changes to test scripts to accommodate different architectures and different

versions of Tcl. (CVS 5057)

FossilOrigin-Name: 8eb2c07c520c12c2cd4610596dbec451c8275e95

diff --git a/manifest b/manifest
index ca41819db99164c8668948f76382fc1fc846e2ec..602dc2e027e79aa7a8c2150b6506617015448e13 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Restore\sthe\s#include\sof\sstdint.h\sremoved\sin\s(5051).\s(CVS\s5056)
-D 2008-04-28T12:54:15
+C Changes\sto\stest\sscripts\sto\saccommodate\sdifferent\sarchitectures\sand\sdifferent\nversions\sof\sTcl.\s(CVS\s5057)
+D 2008-04-28T13:02:58
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -454,7 +454,7 @@ F test/substr.test 4be572ac017143e59b4058dc75c91a0d0dc6d4e0
 F test/sync.test ded6b39d8d8ca3c0c5518516c6371b3316d3e3a3
 F test/table.test 13b1c2e2fb4727b35ee1fb7641fc469214fd2455
 F test/tableapi.test 791f7e3891d9b70bdb43b311694bf5e9befcbc34
-F test/tclsqlite.test 3fac87cb1059c46b8fa8a60b553f4f1adb0fb6d9
+F test/tclsqlite.test 3dfb48f46de4353376fad835390b493ba066b4dc
 F test/tempdb.test b88ac8a19823cf771d742bf61eef93ef337c06b1
 F test/temptable.test 19b851b9e3e64d91e9867619b2a3f5fffee6e125
 F test/tester.tcl 72e180cc91fae17fd6ea43d1cd84558421105b72
@@ -516,7 +516,7 @@ F test/triggerA.test 8dbf5bffa3190bd513785a24a573a166a885fc1b
 F test/triggerB.test abee76e59736a2d10b726d4d361e1ac2e0ce3309
 F test/types.test 98e7a631bddf0806204358b452b02d0e319318a6
 F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
-F test/types3.test b730a7db03ef69f0fdb85b2addc20d1a0a04039b
+F test/types3.test a0f66bf12f80fad89493535474f7a6d16fa58150
 F test/unique.test 0253c4227a5dc533e312202ce21ecfad18058d18
 F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
 F test/utf16.test 20e2d9ba0d57e952a18b1ac8deab9ad49e082893
@@ -630,7 +630,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P fadeed998e63c2fd94811b911cf263713c5fcdca
-R 0bbef799550187d59ef3d072d8e957b3
+P e96e8b9b4137c3ea239674683cf9fd8682851908
+R 0afe0dea2b4e388bca2da8c4bcd08b36
 U drh
-Z 499bba35fc31450c54ccf464ce06e4a5
+Z be6a7bb7666069d4d03be120f2bd1f64

diff --git a/manifest.uuid b/manifest.uuid
index dbea096ef21728660e5938542df01b1392a0362d..f1b35367a607cc8dc745149e76163fd17bb2e50d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e96e8b9b4137c3ea239674683cf9fd8682851908
\ No newline at end of file
+8eb2c07c520c12c2cd4610596dbec451c8275e95
\ No newline at end of file

diff --git a/test/tclsqlite.test b/test/tclsqlite.test
index 1c746f4caf58f82c9351de53d0df604026ffa010..60bd8a3bd31e0dd651a7393bae4ea9e483f98cd7 100644 (file)
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@ -15,7 +15,7 @@
 # interface is pretty well tested.  This file contains some addition
 # tests for fringe issues that the main test suite does not cover.
 #
-# $Id: tclsqlite.test,v 1.63 2007/10/23 08:17:48 danielk1977 Exp $
+# $Id: tclsqlite.test,v 1.64 2008/04/28 13:02:58 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -69,15 +69,15 @@ do_test tcl-1.5 {
   } msg]
   lappend v $msg
 } {0 {}}
+catch {expr x*} msg
 do_test tcl-1.6 {
   set v [catch {
     db eval {SELECT * FROM t1} data {
       expr x*
     }
   } msg]
-  regsub {:.*$} $msg {} msg
   lappend v $msg
-} {1 {syntax error in expression "x*"}}
+} [list 1 $msg]
 do_test tcl-1.7 {
   set v [catch {db} msg]
   lappend v $msg

diff --git a/test/types3.test b/test/types3.test
index 3d48ad8506d1b7e7c5699f97a0efa0ba7bff34de..33f2595cb988f163a4992a75594e419cdc7bb1b6 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.7 2007/06/26 22:42:56 drh Exp $
+# $Id: types3.test,v 1.8 2008/04/28 13:02:58 drh Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -74,10 +74,11 @@ do_test types3-2.2 {
   set V [db one {SELECT 123}]
   tcl_variable_type V
 } int
+set Vx [expr {1+wide(123456789123456)}]
 do_test types3-2.3 {
   set V [db one {SELECT 1234567890123456}]
   tcl_variable_type V
-} wideInt
+} [tcl_variable_type Vx]
 do_test types3-2.4.1 {
   set V [db one {SELECT 1234567890123456.1}]
   tcl_variable_type V