Changes to various test scripts so that they pass on windows.

FossilOrigin-Name: 1586244b6d86d5a98af8c6f7a8324672e02df9c3

diff --git a/manifest b/manifest
index e38d1ab9ba43d9d036e40b086d9829fa734e1a6e..4a3dc78b27ab19969a1f820e3105a40fb7613697 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssqlite3_vtab_on_conflict()\sto\sreturn\sthe\scorrect\svalues\sfor\nABORT,\sFAIL,\sand\sIGNORE.
-D 2011-05-05T17:41:58.205
+C Changes\sto\svarious\stest\sscripts\sso\sthat\sthey\spass\son\swindows.
+D 2011-05-05T19:44:22.749
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -252,7 +252,7 @@ F src/where.c 55403ce19c506be6a321c7f129aff693d6103db5
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
 F test/all.test 51756962d522e474338e9b2ebb26e7364d4aa125
-F test/alter.test 4e47fb9ea59348b88fce4e8bb49de530128b104c
+F test/alter.test a3f570072b53d7c0fe463bab3f5affa8e113c487
 F test/alter2.test 75f731508f1bf27ba09a6075c66cd02216ba464b
 F test/alter3.test 8677e48d95536f7a6ed86a1a774744dadcc22b07
 F test/alter4.test 1e5dd6b951e9f65ca66422edff02e56df82dd403
@@ -312,7 +312,7 @@ F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
 F test/capi3c.test bea67403a5e37a4b33230ee4723e315a2ffb31e7
 F test/capi3d.test cd36571f014f34bdc4421967f6453cbb597d5d16
 F test/capi3e.test f7408dda65c92b9056199fdc180f893015f83dde
-F test/cast.test 166951664a0b0a2e0f8fb5997a152490c6363932
+F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
 F test/check.test db2b29d557544347d28e25b8406f5d5ecc3d1bc3
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
 F test/collate1.test e3eaa48c21e150814be1a7b852d2a8af24458d04
@@ -390,7 +390,7 @@ F test/exclusive.test 53e1841b422e554cecf0160f937c473d6d0e3062
 F test/exclusive2.test 343d55130c12c67b8bf10407acec043a6c26c86b
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 5e2d64b4eb5a9d08876599bdae2e1213d2d12e2a
-F test/expr.test 19e8ac40313e2282a47b586d11c4892040990d3a
+F test/expr.test 67c9fd6f8f829e239dc8b0f4a08a73c08b09196d
 F test/fallocate.test 43dc34b8c24be6baffadc3b4401ee15710ce83c6
 F test/filectrl.test 97003734290887566e01dded09dc9e99cb937e9e
 F test/filefmt.test f178cfc29501a14565954c961b226e61877dd32c
@@ -591,7 +591,7 @@ F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/multiplex.test a88f3e2c16e567e72be7296195c59fbdd6a8d3d4
 F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41
 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
-F test/nan.test a44e04df1486fcfb02d32468cbcd3c8e1e433723
+F test/nan.test dc212a22b36109fd1ae37154292444ef249c5ec2
 F test/notify1.test 8433bc74bd952fb8a6e3f8d7a4c2b28dfd69e310
 F test/notify2.test 195a467e021f74197be2c4fb02d6dee644b8d8db
 F test/notify3.test d60923e186e0900f4812a845fcdfd8eea096e33a
@@ -599,7 +599,7 @@ F test/notnull.test cc7c78340328e6112a13c3e311a9ab3127114347
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/openv2.test af02ed0a9cbc0d2a61b8f35171d4d117e588e4ec
 F test/oserror.test 498d8337e9d15543eb7b004fef8594bf204ff43c
-F test/pager1.test d8672fd0af5f4f9b99b06283d00f01547809bebe
+F test/pager1.test 8baf4470b29511503abcaf1f17d16b16462e4d54
 F test/pager2.test 745b911dde3d1f24ae0870bd433dfa83d7c658c1
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
 F test/pagerfault.test 9de4d3e0c59970b4c6cb8dac511fa242f335d8a7
@@ -689,7 +689,7 @@ F test/tclsqlite.test 8c154101e704170c2be10f137a5499ac2c6da8d3
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
 F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
-F test/tester.tcl d5139260aadd64f318ecbcf982316d5bbc254b1b
+F test/tester.tcl a791ee74cb6b8f8613079ccc018bf2c8b952a26c
 F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
 F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
 F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@ -801,13 +801,13 @@ F test/tkt3793.test 754b73f0e6a9349c70dc57e522cf3247272ecd5d
 F test/tkt3810.test 90fa0635dfa7da9680c8cd3513350a49b3a8ae12
 F test/tkt3824.test 150aa00bb6220672e5f0eb14dc8eaa36750425f0
 F test/tkt3832.test 2300d10d57562b89875b72148338ac3e14f8847d
-F test/tkt3838.test f956f0719b5f805b12dd1dbf19f19d298bacebc3
+F test/tkt3838.test d8490365a1c473d214f7878007e543410cbb715f
 F test/tkt3841.test 4659845bc53f809a5932c61c6ce8c5bb9d6b947f
 F test/tkt3871.test 43ecbc8d90dc83908e2a454aef345acc9d160c6f
 F test/tkt3879.test 2ad5bef2c87e9991ce941e054c31abe26ef7fb90
 F test/tkt3911.test 74cd324f3ba653040cc6d94cc4857b290d12d633
 F test/tkt3918.test e6cdf6bfcfe9ba939d86a4238a9dc55d6eec5d42
-F test/tkt3922.test 022ace32c049e3964f68492c12eb803e8e4856d8
+F test/tkt3922.test f26be40ab4fe6c00795629bd2006d96e270d9b1a
 F test/tkt3929.test 75a862e45bcb39e9a7944c89b92afa531304afca
 F test/tkt3935.test e15261fedb9e30a4305a311da614a5d8e693c767
 F test/tkt3992.test f3e7d548ac26f763b47bc0f750da3d03c81071da
@@ -933,7 +933,10 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 8ba456ae0b3d0c0b6f72f98bd0bc28f72dfa4ff5
-R e350890a304deaff131b57483c8e478b
-U drh
-Z 6b45c0a2e4c7eb15d8acfe532af4cf91
+P f0617d619dc6654f6d27543999c0aad724a0d967
+R 70a14d63b609930237281c63ad04d09e
+T *branch * win32-test-fixes
+T *sym-win32-test-fixes *
+T -sym-trunk *
+U dan
+Z d02b41e7d78bb6d169c1442486a8fed7

diff --git a/manifest.uuid b/manifest.uuid
index 89a83c1a8bd1d211bc215f46430e83671a50cbe3..530cb38e6f7b76db443da28500de74e58013c131 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f0617d619dc6654f6d27543999c0aad724a0d967
\ No newline at end of file
+1586244b6d86d5a98af8c6f7a8324672e02df9c3
\ No newline at end of file

diff --git a/test/alter.test b/test/alter.test
index d4b72a6ae8c49d25f00f966b57bfaca7b2cd2996..359034d5aac358a24113901280f8323f7349af68 100644 (file)
--- a/test/alter.test
+++ b/test/alter.test
@@ -650,7 +650,7 @@ do_test alter-6.7 {
 # Ticket #1665:  Make sure ALTER TABLE ADD COLUMN works on a table
 # that includes a COLLATE clause.
 #
-do_test alter-7.1 {
+do_realnum_test alter-7.1 {
   execsql {
     CREATE TABLE t1(a TEXT COLLATE BINARY);
     ALTER TABLE t1 ADD COLUMN b INTEGER COLLATE NOCASE;

diff --git a/test/cast.test b/test/cast.test
index 7a239439b7fa5331c9984ebc7d35d960b1f5cf59..f47f4bb2bf3fce09682d5231f814a90086139708 100644 (file)
--- a/test/cast.test
+++ b/test/cast.test
@@ -234,7 +234,7 @@ do_test cast-3.1 {
 do_test cast-3.2 {
   execsql {SELECT CAST(9223372036854774800 AS numeric)}
 } 9223372036854774800
-do_test cast-3.3 {
+do_realnum_test cast-3.3 {
   execsql {SELECT CAST(9223372036854774800 AS real)}
 } 9.22337203685477e+18
 do_test cast-3.4 {
@@ -246,7 +246,7 @@ do_test cast-3.5 {
 do_test cast-3.6 {
   execsql {SELECT CAST(-9223372036854774800 AS numeric)}
 } -9223372036854774800
-do_test cast-3.7 {
+do_realnum_test cast-3.7 {
   execsql {SELECT CAST(-9223372036854774800 AS real)}
 } -9.22337203685477e+18
 do_test cast-3.8 {
@@ -258,7 +258,7 @@ do_test cast-3.11 {
 do_test cast-3.12 {
   execsql {SELECT CAST('9223372036854774800' AS numeric)}
 } 9223372036854774800
-do_test cast-3.13 {
+do_realnum_test cast-3.13 {
   execsql {SELECT CAST('9223372036854774800' AS real)}
 } 9.22337203685477e+18
 ifcapable long_double {
@@ -272,7 +272,7 @@ do_test cast-3.15 {
 do_test cast-3.16 {
   execsql {SELECT CAST('-9223372036854774800' AS numeric)}
 } -9223372036854774800
-do_test cast-3.17 {
+do_realnum_test cast-3.17 {
   execsql {SELECT CAST('-9223372036854774800' AS real)}
 } -9.22337203685477e+18
 ifcapable long_double {
@@ -287,7 +287,7 @@ if {[db eval {PRAGMA encoding}]=="UTF-8"} {
   do_test cast-3.22 {
     execsql {SELECT CAST(x'39323233333732303336383534373734383030' AS numeric)}
   } 9223372036854774800
-  do_test cast-3.23 {
+  do_realnum_test cast-3.23 {
     execsql {SELECT CAST(x'39323233333732303336383534373734383030' AS real)}
   } 9.22337203685477e+18
   ifcapable long_double {

diff --git a/test/expr.test b/test/expr.test
index 5a3d16751767b74b9dd3fac1b85ab81c37193b7f..cc4c9c67f1815e4a76db82292434e18fd08650aa 100644 (file)
--- a/test/expr.test
+++ b/test/expr.test
@@ -32,6 +32,11 @@ proc test_expr {name settings expr result} {
     execsql {BEGIN; UPDATE test1 SET %s; SELECT %s FROM test1; ROLLBACK;}
   } $settings $expr] $result
 }
+proc test_realnum_expr {name settings expr result} {
+  do_realnum_test $name [format {
+    execsql {BEGIN; UPDATE test1 SET %s; SELECT %s FROM test1; ROLLBACK;}
+  } $settings $expr] $result
+}
 
 test_expr expr-1.1 {i1=10, i2=20} {i1+i2} 30
 test_expr expr-1.2 {i1=10, i2=20} {i1-i2} -10
@@ -164,7 +169,7 @@ ifcapable floatingpoint {
 }
 
 if {[working_64bit_int]} {
-  test_expr expr-1.106 {i1=0} {-9223372036854775808/-1} 9.22337203685478e+18
+  test_realnum_expr expr-1.106 {i1=0} {-9223372036854775808/-1} 9.22337203685478e+18
 }
 
 test_expr expr-1.107 {i1=0} {-9223372036854775808%-1} 0
@@ -203,100 +208,100 @@ test_expr expr-1.126 {i1=8, i2=8} \
 ifcapable floatingpoint {if {[working_64bit_int]} {
   test_expr expr-1.200\
       {i1=9223372036854775806, i2=1} {i1+i2}      9223372036854775807
-  test_expr expr-1.201\
+  test_realnum_expr expr-1.201\
       {i1=9223372036854775806, i2=2} {i1+i2}      9.22337203685478e+18
-  test_expr expr-1.202\
+  test_realnum_expr expr-1.202\
       {i1=9223372036854775806, i2=100000} {i1+i2} 9.22337203685488e+18
-  test_expr expr-1.203\
+  test_realnum_expr expr-1.203\
       {i1=9223372036854775807, i2=0} {i1+i2}      9223372036854775807
-  test_expr expr-1.204\
+  test_realnum_expr expr-1.204\
       {i1=9223372036854775807, i2=1} {i1+i2}      9.22337203685478e+18
-  test_expr expr-1.205\
+  test_realnum_expr expr-1.205\
       {i2=9223372036854775806, i1=1} {i1+i2}      9223372036854775807
-  test_expr expr-1.206\
+  test_realnum_expr expr-1.206\
       {i2=9223372036854775806, i1=2} {i1+i2}      9.22337203685478e+18
-  test_expr expr-1.207\
+  test_realnum_expr expr-1.207\
       {i2=9223372036854775806, i1=100000} {i1+i2} 9.22337203685488e+18
-  test_expr expr-1.208\
+  test_realnum_expr expr-1.208\
       {i2=9223372036854775807, i1=0} {i1+i2}      9223372036854775807
-  test_expr expr-1.209\
+  test_realnum_expr expr-1.209\
       {i2=9223372036854775807, i1=1} {i1+i2}      9.22337203685478e+18
-  test_expr expr-1.210\
+  test_realnum_expr expr-1.210\
       {i1=-9223372036854775807, i2=-1} {i1+i2}    -9223372036854775808
-  test_expr expr-1.211\
+  test_realnum_expr expr-1.211\
       {i1=-9223372036854775807, i2=-2} {i1+i2}    -9.22337203685478e+18
-  test_expr expr-1.212\
+  test_realnum_expr expr-1.212\
       {i1=-9223372036854775807, i2=-100000} {i1+i2} -9.22337203685488e+18
-  test_expr expr-1.213\
+  test_realnum_expr expr-1.213\
       {i1=-9223372036854775808, i2=0} {i1+i2}     -9223372036854775808
-  test_expr expr-1.214\
+  test_realnum_expr expr-1.214\
       {i1=-9223372036854775808, i2=-1} {i1+i2}    -9.22337203685478e+18
-  test_expr expr-1.215\
+  test_realnum_expr expr-1.215\
       {i2=-9223372036854775807, i1=-1} {i1+i2}    -9223372036854775808
-  test_expr expr-1.216\
+  test_realnum_expr expr-1.216\
       {i2=-9223372036854775807, i1=-2} {i1+i2}    -9.22337203685478e+18
-  test_expr expr-1.217\
+  test_realnum_expr expr-1.217\
       {i2=-9223372036854775807, i1=-100000} {i1+i2} -9.22337203685488e+18
-  test_expr expr-1.218\
+  test_realnum_expr expr-1.218\
       {i2=-9223372036854775808, i1=0} {i1+i2}     -9223372036854775808
-  test_expr expr-1.219\
+  test_realnum_expr expr-1.219\
       {i2=-9223372036854775808, i1=-1} {i1+i2}    -9.22337203685478e+18
-  test_expr expr-1.220\
+  test_realnum_expr expr-1.220\
       {i1=9223372036854775806, i2=-1} {i1-i2}     9223372036854775807
-  test_expr expr-1.221\
+  test_realnum_expr expr-1.221\
       {i1=9223372036854775806, i2=-2} {i1-i2}      9.22337203685478e+18
-  test_expr expr-1.222\
+  test_realnum_expr expr-1.222\
       {i1=9223372036854775806, i2=-100000} {i1-i2} 9.22337203685488e+18
-  test_expr expr-1.223\
+  test_realnum_expr expr-1.223\
       {i1=9223372036854775807, i2=0} {i1-i2}      9223372036854775807
-  test_expr expr-1.224\
+  test_realnum_expr expr-1.224\
       {i1=9223372036854775807, i2=-1} {i1-i2}      9.22337203685478e+18
-  test_expr expr-1.225\
+  test_realnum_expr expr-1.225\
       {i2=-9223372036854775806, i1=1} {i1-i2}      9223372036854775807
-  test_expr expr-1.226\
+  test_realnum_expr expr-1.226\
       {i2=-9223372036854775806, i1=2} {i1-i2}      9.22337203685478e+18
-  test_expr expr-1.227\
+  test_realnum_expr expr-1.227\
       {i2=-9223372036854775806, i1=100000} {i1-i2} 9.22337203685488e+18
-  test_expr expr-1.228\
+  test_realnum_expr expr-1.228\
       {i2=-9223372036854775807, i1=0} {i1-i2}      9223372036854775807
-  test_expr expr-1.229\
+  test_realnum_expr expr-1.229\
       {i2=-9223372036854775807, i1=1} {i1-i2}      9.22337203685478e+18
-  test_expr expr-1.230\
+  test_realnum_expr expr-1.230\
       {i1=-9223372036854775807, i2=1} {i1-i2}    -9223372036854775808
-  test_expr expr-1.231\
+  test_realnum_expr expr-1.231\
       {i1=-9223372036854775807, i2=2} {i1-i2}    -9.22337203685478e+18
-  test_expr expr-1.232\
+  test_realnum_expr expr-1.232\
       {i1=-9223372036854775807, i2=100000} {i1-i2} -9.22337203685488e+18
-  test_expr expr-1.233\
+  test_realnum_expr expr-1.233\
       {i1=-9223372036854775808, i2=0} {i1-i2}     -9223372036854775808
-  test_expr expr-1.234\
+  test_realnum_expr expr-1.234\
       {i1=-9223372036854775808, i2=1} {i1-i2}    -9.22337203685478e+18
-  test_expr expr-1.235\
+  test_realnum_expr expr-1.235\
       {i2=9223372036854775807, i1=-1} {i1-i2}    -9223372036854775808
-  test_expr expr-1.236\
+  test_realnum_expr expr-1.236\
       {i2=9223372036854775807, i1=-2} {i1-i2}    -9.22337203685478e+18
-  test_expr expr-1.237\
+  test_realnum_expr expr-1.237\
       {i2=9223372036854775807, i1=-100000} {i1-i2} -9.22337203685488e+18
-  test_expr expr-1.238\
+  test_realnum_expr expr-1.238\
       {i2=9223372036854775807, i1=0} {i1-i2}     -9223372036854775807
-  test_expr expr-1.239\
+  test_realnum_expr expr-1.239\
       {i2=9223372036854775807, i1=-1} {i1-i2}    -9223372036854775808
 
-  test_expr expr-1.250\
+  test_realnum_expr expr-1.250\
       {i1=4294967296, i2=2147483648} {i1*i2}      9.22337203685478e+18
-  test_expr expr-1.251\
+  test_realnum_expr expr-1.251\
       {i1=4294967296, i2=2147483647} {i1*i2}      9223372032559808512
-  test_expr expr-1.252\
+  test_realnum_expr expr-1.252\
       {i1=-4294967296, i2=2147483648} {i1*i2}     -9223372036854775808
-  test_expr expr-1.253\
+  test_realnum_expr expr-1.253\
       {i1=-4294967296, i2=2147483647} {i1*i2}     -9223372032559808512
-  test_expr expr-1.254\
+  test_realnum_expr expr-1.254\
       {i1=4294967296, i2=-2147483648} {i1*i2}     -9223372036854775808
-  test_expr expr-1.255\
+  test_realnum_expr expr-1.255\
       {i1=4294967296, i2=-2147483647} {i1*i2}     -9223372032559808512
-  test_expr expr-1.256\
+  test_realnum_expr expr-1.256\
       {i1=-4294967296, i2=-2147483648} {i1*i2}    9.22337203685478e+18
-  test_expr expr-1.257\
+  test_realnum_expr expr-1.257\
       {i1=-4294967296, i2=-2147483647} {i1*i2}    9223372032559808512
 
 }}
@@ -883,7 +888,7 @@ do_test expr-12.2 {
 } {1 {near ")": syntax error}}
 
 ifcapable floatingpoint {
-  do_test expr-13.1 {
+  do_realnum_test expr-13.1 {
     execsql {
       SELECT 12345678901234567890;
     }
@@ -908,12 +913,12 @@ if {[working_64bit_int]} {
 # If the value is too large, use String->Float conversion.
 #
 ifcapable floatingpoint {
-  do_test expr-13.4 {
+  do_realnum_test expr-13.4 {
     execsql {
       SELECT 0+'9223372036854775808'
     }
   } {9.22337203685478e+18}
-  do_test expr-13.5 {
+  do_realnum_test expr-13.5 {
     execsql {
       SELECT '9223372036854775808'+0
     }
@@ -923,12 +928,12 @@ ifcapable floatingpoint {
 # Use String->float conversion if the value is explicitly a floating
 # point value.
 #
-do_test expr-13.6 {
+do_realnum_test expr-13.6 {
   execsql {
     SELECT 0+'9223372036854775807.0'
   }
 } {9.22337203685478e+18}
-do_test expr-13.7 {
+do_realnum_test expr-13.7 {
   execsql {
     SELECT '9223372036854775807.0'+0
   }

diff --git a/test/nan.test b/test/nan.test
index 0e9462fcb5cfd0b822ff19e0b3a605f2163db9b8..3257a439e400e56d531da4631f3ccbc9fee75526 100644 (file)
--- a/test/nan.test
+++ b/test/nan.test
@@ -42,31 +42,31 @@ do_test nan-1.1.1 {
   db eval {SELECT x, typeof(x) FROM t1}
 } {{} null}
 if {$tcl_platform(platform) != "symbian"} {
-  do_test nan-1.1.2 {
+  do_realnum_test nan-1.1.2 {
     sqlite3_bind_double $::STMT 1 +Inf
     sqlite3_step $::STMT
     sqlite3_reset $::STMT
     db eval {SELECT x, typeof(x) FROM t1}
   } {{} null inf real}
-  do_test nan-1.1.3 {
+  do_realnum_test nan-1.1.3 {
     sqlite3_bind_double $::STMT 1 -Inf
     sqlite3_step $::STMT
     sqlite3_reset $::STMT
     db eval {SELECT x, typeof(x) FROM t1}
   } {{} null inf real -inf real}
-  do_test nan-1.1.4 {
+  do_realnum_test nan-1.1.4 {
     sqlite3_bind_double $::STMT 1 -NaN
     sqlite3_step $::STMT
     sqlite3_reset $::STMT
     db eval {SELECT x, typeof(x) FROM t1}
   } {{} null inf real -inf real {} null}
-  do_test nan-1.1.5 {
+  do_realnum_test nan-1.1.5 {
     sqlite3_bind_double $::STMT 1 NaN0
     sqlite3_step $::STMT
     sqlite3_reset $::STMT
     db eval {SELECT x, typeof(x) FROM t1}
   } {{} null inf real -inf real {} null {} null}
-  do_test nan-1.1.6 {
+  do_realnum_test nan-1.1.6 {
     sqlite3_bind_double $::STMT 1 -NaN0
     sqlite3_step $::STMT
     sqlite3_reset $::STMT
@@ -231,12 +231,12 @@ if {$tcl_platform(platform) != "symbian"} {
   # Do not run these tests on Symbian, as the Tcl port doesn't like to
   # convert from floating point value "-inf" to a string.
   #
-  do_test nan-4.7 {
+  do_realnum_test nan-4.7 {
     db eval {DELETE FROM t1}
     db eval "INSERT INTO t1 VALUES([string repeat 9 309].0)"
     db eval {SELECT x, typeof(x) FROM t1}
   } {inf real}
-  do_test nan-4.8 {
+  do_realnum_test nan-4.8 {
     db eval {DELETE FROM t1}
     db eval "INSERT INTO t1 VALUES(-[string repeat 9 309].0)"
     db eval {SELECT x, typeof(x) FROM t1}
@@ -313,7 +313,7 @@ do_test nan-4.18 {
   db eval {SELECT CAST(x AS text), typeof(x) FROM t1}
 } {-9.88131291682493e-324 real}
 
-do_test nan-4.20 {
+do_realnum_test nan-4.20 {
   db eval {DELETE FROM t1}
   set big [string repeat 9 10000].0e-9000
   db eval "INSERT INTO t1 VALUES($big)"

diff --git a/test/pager1.test b/test/pager1.test
index 8c31e1539c36689863f9d508cf0c6492a07c7a7a..fbdd4b20b97ea6cda9d81b1220223440ebec7aac 100644 (file)
--- a/test/pager1.test
+++ b/test/pager1.test
@@ -1653,7 +1653,7 @@ for {set i 0} {$i<513} {incr i 3} {
 testvfs tv -default 1
 tv script xOpenCb
 tv filter xOpen
-proc xOpenCb {method filename} {
+proc xOpenCb {method filename args} {
   set ::file_len [string length $filename]
 }
 sqlite3 db test.db
@@ -2381,6 +2381,7 @@ do_test pager1-30.1 {
 # file can still be rolled back. This is required for backward compatibility -
 # versions of SQLite prior to 3.5.8 always set this field to zero.
 #
+if {$tcl_platform(platform)=="unix"} {
 do_test pager1-31.1 {
   faultsim_delete_and_reopen
   execsql {
@@ -2408,7 +2409,7 @@ do_test pager1-31.1 {
   sqlite3 db2 test.db2
   execsql { PRAGMA integrity_check } db2
 } {ok}
-
+}
 
 
 finish_test

diff --git a/test/tester.tcl b/test/tester.tcl
index 7e15ab07d670655b0433d402a2a4024864d3b2da..0b66c3d78876e4b2e9e03dc3036be1896e89fbe0 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -354,6 +354,15 @@ proc do_test {name cmd expected} {
   flush stdout
 }
 
+proc realnum_normalize {r} {
+  string map {1.#INF inf} [regsub -all {(e[+-])0+} $r {\1}]
+}
+proc do_realnum_test {name cmd expected} {
+  uplevel [list do_test $name [
+    subst -nocommands { realnum_normalize [ $cmd ] }
+  ] [realnum_normalize $expected]]
+}
+
 proc fix_testname {varname} {
   upvar $varname testname
   if {[info exists ::testprefix] 

diff --git a/test/tkt3838.test b/test/tkt3838.test
index 4fb5c55a8a24be3d2eae8314f415cb43bf9d4f67..5dfc2b8afc95863e43c5709d35573ba934e47784 100644 (file)
--- a/test/tkt3838.test
+++ b/test/tkt3838.test
@@ -25,7 +25,7 @@ ifcapable !altertable {
   return
 }
 
-do_test tkt3838-1.1 {
+do_realnum_test tkt3838-1.1 {
   db eval {
     PRAGMA encoding=UTF16;
     CREATE TABLE t1(x);

diff --git a/test/tkt3922.test b/test/tkt3922.test
index 6506dcedb7f5d3f89ebabc3fb9e54f36cb0ecda1..86bf5feceb71fdfc3e02e641d007d8fab518c5f9 100644 (file)
--- a/test/tkt3922.test
+++ b/test/tkt3922.test
@@ -36,21 +36,21 @@ if {[working_64bit_int]} {
     }
   } {-1 integer}
 }
-do_test tkt3922.2 {
+do_realnum_test tkt3922.2 {
   execsql {
     DELETE FROM t1;
     INSERT INTO t1 VALUES('-9223372036854775809');
     SELECT a, typeof(a) FROM t1;
   }
 } {-9.22337203685478e+18 real}
-do_test tkt3922.3 {
+do_realnum_test tkt3922.3 {
   execsql {
     DELETE FROM t1;
     INSERT INTO t1 VALUES('-9223372036854776832');
     SELECT a, typeof(a) FROM t1;
   }
 } {-9.22337203685478e+18 real}
-do_test tkt3922.4 {
+do_realnum_test tkt3922.4 {
   execsql {
     DELETE FROM t1;
     INSERT INTO t1 VALUES('-9223372036854776833');
@@ -78,7 +78,7 @@ if {[working_64bit_int]} {
     }
   } {1 integer}
 }
-do_test tkt3922.6 {
+do_realnum_test tkt3922.6 {
   execsql {
     DELETE FROM t1;
     INSERT INTO t1 VALUES('9223372036854775808');