From 6559172e1a2cccadb39729e47e4c7393c727d2a9 Mon Sep 17 00:00:00 2001 From: dan Date: Wed, 26 Jun 2013 16:30:26 +0000 Subject: [PATCH] Update the boundary3.tcl script so that it can be run with tcl 8.5 or 8.6 to regenerate boundary3.test. FossilOrigin-Name: ebac5afa471526dffc8026e66753263476137a3b --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/boundary3.tcl | 17 ++++++++--------- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/manifest b/manifest index 90d6e4c471..b4416bedee 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\sthe\sSQLITE_STMTSTATUS_VM_STEPS\soption\sfor\ssqlite3_stmt_status(). -D 2013-06-26T13:22:28.231 +C Update\sthe\sboundary3.tcl\sscript\sso\sthat\sit\scan\sbe\srun\swith\stcl\s8.5\sor\s8.6\sto\sregenerate\sboundary3.test. +D 2013-06-26T16:30:26.017 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -347,7 +347,7 @@ F test/boundary1.tcl 6421b2d920d8b09539503a8673339d32f7609eb1 F test/boundary1.test 66d7f4706ccdb42d58eafdb081de07b0eb42d77b F test/boundary2.tcl e34ef4e930cf1083150d4d2c603e146bd3b76bcb F test/boundary2.test 9ae758d7dab7e882c8b6cc4a6a10278385bff8fa -F test/boundary3.tcl 8901d6a503d0bf64251dd81cc74e5ad3add4b119 +F test/boundary3.tcl 23361e108a125dca9c4080c2feb884fe54d69243 F test/boundary3.test 56ef82096b4329aca2be74fa1e2b0f762ea0eb45 F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983 F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b @@ -1097,7 +1097,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac -P 6505e2ab0200736c525b5cfcf1cb62c0bd4d18ee f1366bab737a3ac2ea20a0ec014cc306d7ded8a5 -R f18ef17a1aa4ad99e11ed462c222b226 -U drh -Z 6991e339422447eb9d48847676d4d2d7 +P bd4267f17bbf5d01fb3f12a5a06e94fcbcbd785c +R 118665a53b744c10dec91aec5e03fe4a +U dan +Z 904ba10d85535f576efff62240fd45d6 diff --git a/manifest.uuid b/manifest.uuid index 95968b0111..1c32abe238 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -bd4267f17bbf5d01fb3f12a5a06e94fcbcbd785c \ No newline at end of file +ebac5afa471526dffc8026e66753263476137a3b \ No newline at end of file diff --git a/test/boundary3.tcl b/test/boundary3.tcl index ac3bf0ad94..5fc26d6113 100644 --- a/test/boundary3.tcl +++ b/test/boundary3.tcl @@ -13,7 +13,6 @@ puts {# 2008 December 11 # This file is automatically generated from a separate TCL script. # This file seeks to exercise integer boundary values. # -# $Id: boundary3.tcl,v 1.3 2009/01/02 15:45:48 shane Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl @@ -40,16 +39,16 @@ foreach x { } { set x [expr {wide($x)}] set boundarynum($x) 1 - set boundarynum([expr {$x+1}]) 1 - set boundarynum([expr {-($x+1)}]) 1 - set boundarynum([expr {-($x+2)}]) 1 - set boundarynum([expr {$x+$x+1}]) 1 - set boundarynum([expr {$x+$x+2}]) 1 + set boundarynum([expr {wide($x+1)}]) 1 + set boundarynum([expr {wide(-($x+1))}]) 1 + set boundarynum([expr {wide(-($x+2))}]) 1 + set boundarynum([expr {wide($x+$x+1)}]) 1 + set boundarynum([expr {wide($x+$x+2)}]) 1 } set x [expr {wide(127)}] for {set i 1} {$i<=9} {incr i} { set boundarynum($x) 1 - set boundarynum([expr {$x+1}]) 1 + set boundarynum([expr {wide($x+1)}]) 1 set x [expr {wide($x*128 + 127)}] } @@ -116,7 +115,7 @@ foreach r $nums1 { incr a set t1ra($r) $a set t1ar($a) $r - set x [format %08x%08x [expr {wide($r)>>32}] $r] + set x [format %016x [expr {wide($r)}]] set t1rx($r) $x set t1xr($x) $r puts " INSERT INTO t1(oid,a,x) VALUES($r,$a,'$x');" @@ -158,7 +157,7 @@ foreach r $nums3 { set r5 $r.5 set r0 $r.0 - if {abs($r)<9.22337203685477580800e+18} { + if {abs($r)<0x7FFFFFFFFFFFFFFF || $r==-9223372036854775808} { set x $t1rx($r) set a $t1ra($r) puts "do_test $tname-2.$i.1 \173"