More minor test file fixes.

FossilOrigin-Name: 352878fe1cbcf7b6803624544bba5a95565d1638d4dd09e91764ddad17889301

diff --git a/manifest b/manifest
index ff73687fb281d86ee0a0dfc130242d91e8155256..b7c4022fa2814de3cc547c449a04c09944ba2325 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sDROP\sTABLE\sto\swork\son\stables\sname\s"sqlite_parameters"\sjust\sas\sit\ndoes\swith\stables\snamed\s"sqlite_stat%".\s\sFix\sfor\sthe\s".parameter\sclear"\ncommand\sin\sthe\sshell.
-D 2019-09-26T20:05:16.902
+C More\sminor\stest\sfile\sfixes.
+D 2019-09-26T20:57:53.477
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -769,7 +769,7 @@ F test/corruptH.test 79801d97ec5c2f9f3c87739aa1ec2eb786f96454
 F test/corruptI.test a17bbf54fdde78d43cf3cc34b0057719fd4a173a3d824285b67dc5257c064c7b
 F test/corruptJ.test 4d5ccc4bf959464229a836d60142831ef76a5aa4
 F test/corruptK.test 5b4212fe346699831c5ad559a62c54e11c0611bdde1ea8423a091f9c01aa32af
-F test/corruptL.test 865cb75ed971b72b5ee9ad9017befee6bd38794011cae69f00676d82c5a5dd69
+F test/corruptL.test dfad96373bf9264d73039315ea6013994b90bf6776847adc7ec06b6fad3c04b2
 F test/corruptM.test 04a4061b1979283851953217e411187be79e50f5e5e3ef340c3f8e564173aae1
 F test/cost.test 51f4fcaae6e78ad5a57096831259ed6c760e2ac6876836e91c00030fad385b34
 F test/count.test cb2e0f934c6eb33670044520748d2ecccd46259c
@@ -1249,7 +1249,7 @@ F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8
 F test/regexp2.test 40e894223b3d6672655481493f1be12012f2b33c
 F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2118d
 F test/releasetest.tcl 968fc1e8fd23e113fb8a04379747f3a9f2c12d207b2de85aeff5a825962e1cd7 x
-F test/releasetest_data.tcl 4f55292d7e3e7995754373612a16b71f41be22dfded3a0375ccaf65c465d3765
+F test/releasetest_data.tcl 9919fc6ac5bc92f8878fecfd1840db15999f660a6c9f609240b41aa62b885c88
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
@@ -1845,7 +1845,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 0ceab26f15c4c7039647cbccf8939dd5c36a60b70ffeefcd3b415c8d4d8351cd
-R 7e8a016d0ced277f004485b7e1d4e510
-U drh
-Z 272e19c3da6480badc2db6c8e87aaef9
+P e768179baacb2423205a774cc8149fe58ed86a9320102aff4844b1d8933aa1db
+R 4ad26743e9ded1875bce184cfaaacaab
+U dan
+Z 6b4a7dc3b746ae2b0bb2a8276c6ee58f

diff --git a/manifest.uuid b/manifest.uuid
index 0c0126a70f116cfef618830c71132bc110d334cb..9c2f0661b1f51e7aef59e76c5b8bd2347c442c13 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e768179baacb2423205a774cc8149fe58ed86a9320102aff4844b1d8933aa1db
\ No newline at end of file
+352878fe1cbcf7b6803624544bba5a95565d1638d4dd09e91764ddad17889301
\ No newline at end of file

diff --git a/test/corruptL.test b/test/corruptL.test
index 9351d9f6eac8db1524bb43855cb9edc1c1410f19..b0ad66db448c3558feba0568a5fdac70b3b208d1 100644 (file)
--- a/test/corruptL.test
+++ b/test/corruptL.test
@@ -377,11 +377,14 @@ do_test 4.0 {
 | end crash-6b48ba69806134.db
 }]} {}
 
+set res {1 {database disk image is malformed}}
+ifcapable oversize_cell_check {
+  set res {1 {no such table: t3}}
+}
 do_catchsql_test 4.1 {
   PRAGMA writable_schema=ON; -- bypass improved sqlite_master consistency checking
   INSERT INTO t3 SELECT * FROM t2;
-} {1 {database disk image is malformed}}
-
+} $res
 
 #-------------------------------------------------------------------------
 reset_db
@@ -835,11 +838,14 @@ do_test 8.0 {
 | end a.db
 }]} {}
 
-
+set res {1 {database disk image is malformed}}
+ifcapable oversize_cell_check {
+  set res {1 {no such table: t3}}
+}
 do_catchsql_test 8.1 {
   PRAGMA writable_schema=ON; -- bypass improved sqlite_master consistency checking
   INSERT INTO t3 SELECT * FROM t2;
-} {1 {database disk image is malformed}}
+} $res
 
 #-------------------------------------------------------------------------
 reset_db

diff --git a/test/releasetest_data.tcl b/test/releasetest_data.tcl
index 638a45d555776444ba0b5b733a007317dad7c062..bd3f108118aafbd4a6631ff220980546f065b5f2 100644 (file)
--- a/test/releasetest_data.tcl
+++ b/test/releasetest_data.tcl
@@ -578,10 +578,14 @@ proc main_tests {args} {
     puts "$config \"$target\""
     if {$bNodebug==0 && $bNosynthetic==0} {
       set iHas [string first SQLITE_DEBUG $::Configs($config)]
+      set dtarget test
+      if {$target=="tcltest"} {
+        set dtarget tcltest
+      }
       if {$iHas>=0} {
-        puts "$config-ndebug \"test\""
+        puts "$config-ndebug \"$dtarget\""
       } else {
-        puts "$config-debug \"test\""
+        puts "$config-debug \"$dtarget\""
       }
     }
   }