Fix minor problems in tcl test scripts.

FossilOrigin-Name: 56b664185e3e56ad22e0c16a5b946fc8204d4d33221b6b4269d6d650dfd9969c

diff --git a/manifest b/manifest
index 1781e84beabc81ff8277debb77871e378e482fc8..8f6aab9efb5dcdf50a783ece7ca1c195526bfbf4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\stest/wapptest.tcl\sscript,\san\salternative\sto\sreleasetest.tcl\sthat\suses\swapp\sto\sprovide\sthe\suser-interface.
-D 2019-04-11T19:07:17.895
+C Fix\sminor\sproblems\sin\stcl\stest\sscripts.
+D 2019-04-12T12:10:03.134
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -628,7 +628,7 @@ F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
 F test/altertab.test 6e13f13d8c30708f16187908c31dadb1bfff9e3cb2a07a7392a7a5e076f58f4a
 F test/altertab2.test 5d423a2d1006085b05cc1b788863d5a860ea2da21c4f892d15e2f2a34c78348a
-F test/altertab3.test b917c2a287a1a97d6e2de216357066441985326a148c99467ca5c73dc17b386a
+F test/altertab3.test 40f2ce9be675e354d3e55c72f8baf38813be975ff4dd9e6b3144493c3c5bc033
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 7168c8bffa5d5cbc53c05b7e9c7fcdd24b365a1bc5046ce80c45efa3c02e6b7c
 F test/analyze3.test ff62d9029e6deb2c914490c6b00caf7fae47cc85cdc046e4a0d0a4d4b87c71d8
@@ -753,7 +753,7 @@ F test/corrupt8.test 2399dfe40d2c0c63af86706e30f3e6302a8d0516
 F test/corrupt9.test 730a3db08d4ab9aa43392ea30d9c2b4879cbff85
 F test/corruptA.test 112f4b2ae0b95ebf3ea63718642fb969a93acea557ace3a307234d19c245989b
 F test/corruptB.test 73a8d6c0b9833697ecf16b63e3c5c05c945b5dec
-F test/corruptC.test 138ecb02188ed1a719b533d4a139568204039f72f00e07a8d30d920bd83122db
+F test/corruptC.test 776f43eb7df750f6d00b8b59c36c3b690822b2880ddbd80d22bf44e9f66acf5c
 F test/corruptD.test 33a37ce3ed56a20093ceee778cd2d7109c7085a59f3213d2baede11d952e8e50
 F test/corruptE.test 82ccf4f8f543fdbedd4aa42c709cb077f7374c62
 F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
@@ -1128,7 +1128,7 @@ F test/malloctraceviewer.tcl b7a54595270c1d201abf1c3f3d461f27eaf24cdef623ad08a0f
 F test/manydb.test 28385ae2087967aa05c38624cec7d96ec74feb3e
 F test/mem5.test c6460fba403c5703141348cd90de1c294188c68f
 F test/memdb.test c1f2a343ad14398d5d6debda6ea33e80d0dafcc7
-F test/memdb1.test 86fe8f259c5aa0b3118cf78a5a895882c4f398497ad5ea5d08f6604145eac685
+F test/memdb1.test 58d92c2bf622cc5f0f41461e1b35cf64f3f787199544c2c1dada37d88753f9d4
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
@@ -1205,7 +1205,7 @@ F test/pg_common.tcl 4740dc35190d6acdab14c097783331361301ab504a94d948f6afbb56ce0
 F test/pragma.test cf066fe0f7f5d49f4758de4986407b8676c61aaa7871599340d64f42a8edc352
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 8300aa9c63cff1027006ca34bf413a148abbd6dcd471fa9a1ded322fe18c0df9
-F test/pragma4.test 52d8186f9e8d09b87189432cdd401dfa66d0b32445e837fa19046c8ae7621b0e
+F test/pragma4.test 26b250531f1c58d9b6187b663f411cd6baf227a4afeffa8f75d0f4c101f4920d
 F test/pragma5.test 824ce6ced5d6b7ec71abe37fc6005ff836fe39d638273dc5192b39864b9ee983
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
 F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
@@ -1818,8 +1818,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 d71f8bbc4efd8af935671c4e7626862d6e5a4c2e51527b9e82b2f0c94ddf6e93 d805fc0cf1c4ef07a7bc947f75828931e3788d0e64730caab3b42ae58009a194
-R 3c54551b10c87fc6f05051e8c995cc5e
-T +closed d805fc0cf1c4ef07a7bc947f75828931e3788d0e64730caab3b42ae58009a194
+P edd87cd606ce264f181c16bbe889adeb8b27e90914f914c0f5d7b68c2dc2d7bd
+R a190e61a3c10408ada28f6dc22290632
 U dan
-Z 54f6897aa8412eba0cb13c03efd1a483
+Z 14c3e0b5a74aff4aef55db69a3d8a0d0

diff --git a/manifest.uuid b/manifest.uuid
index c766219abb566e6c7189f76205b536c1d68d708f..a150580125281deecd7cca283ce9e6d9d451656e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-edd87cd606ce264f181c16bbe889adeb8b27e90914f914c0f5d7b68c2dc2d7bd
\ No newline at end of file
+56b664185e3e56ad22e0c16a5b946fc8204d4d33221b6b4269d6d650dfd9969c
\ No newline at end of file

diff --git a/test/altertab3.test b/test/altertab3.test
index 927b0d7bfcc73230ede3ccc6a1891617107b592d..2bf6a9ddc1af61f20b1339d73822667a691c2184 100644 (file)
--- a/test/altertab3.test
+++ b/test/altertab3.test
@@ -99,8 +99,9 @@ do_execsql_test 4.1.2 {
   COMMIT;
 }
 do_execsql_test 4.1.3 {
-  SELECT * FROM sqlite_master WHERE type='table' AND name!='t1';
-} {table t3 t3 3 {CREATE TABLE t3(e, f)}}
+  SELECT type, name, tbl_name, sql 
+  FROM sqlite_master WHERE type='table' AND name!='t1';
+} {table t3 t3 {CREATE TABLE t3(e, f)}}
 
 
 do_catchsql_test 4.2.1 {
@@ -111,8 +112,9 @@ do_execsql_test 4.2.2 {
   COMMIT;
 }
 do_execsql_test 4.2.3 {
-  SELECT * FROM sqlite_master WHERE type='table' AND name!='t1';
-} {table t3 t3 3 {CREATE TABLE t3(e, f)}}
+  SELECT type, name, tbl_name, sql 
+  FROM sqlite_master WHERE type='table' AND name!='t1';
+} {table t3 t3 {CREATE TABLE t3(e, f)}}
 
 #-------------------------------------------------------------------------
 reset_db

diff --git a/test/corruptC.test b/test/corruptC.test
index 7c6ffb81028030b8d451b351008ec43a65faf9a6..d151a27304609635e78688584a1bf6ebb7aa68a3 100644 (file)
--- a/test/corruptC.test
+++ b/test/corruptC.test
@@ -97,7 +97,8 @@ do_test corruptC-2.1 {
 
   sqlite3 db test.db
   catchsql {PRAGMA integrity_check}
-} {1 {database disk image is malformed}}
+} {0 {{*** in database main ***
+Page 3: free space corruption}}}
 
 # test that a corrupt content offset size is handled (seed 5649)
 #

diff --git a/test/memdb1.test b/test/memdb1.test
index 46e0de3edb093b33fd212082c6620d9c8f3f4605..81e9359211428ab465afe3bd1942c6a4f4dc3fb2 100644 (file)
--- a/test/memdb1.test
+++ b/test/memdb1.test
@@ -186,19 +186,21 @@ do_test 620 {
 } {1 {wrong # args: should be "db serialize ?DATABASE?"}}
 
 #-------------------------------------------------------------------------
-reset_db
-do_execsql_test 700 {
-  CREATE TABLE t1(a, b);
-  PRAGMA schema_version = 0;
-}
-do_test 710 {
-  set ser [db serialize main]
-  db close
-  sqlite3 db
-  db deserialize main $ser
-  catchsql {
-    CREATE VIRTUAL TABLE t1 USING rtree(id, a, b, c, d);
+ifcapable vtab {
+  reset_db
+  do_execsql_test 700 {
+    CREATE TABLE t1(a, b);
+    PRAGMA schema_version = 0;
   }
-} {1 {table t1 already exists}}
+  do_test 710 {
+    set ser [db serialize main]
+    db close
+    sqlite3 db
+    db deserialize main $ser
+    catchsql {
+      CREATE VIRTUAL TABLE t1 USING rtree(id, a, b, c, d);
+    }
+  } {1 {table t1 already exists}}
+}
 
 finish_test

diff --git a/test/pragma4.test b/test/pragma4.test
index 2810ac93599666fc024b5bb5bbc6598ed53550bc..afc7260484415e3a1c2f635183a1353cf92cee37 100644 (file)
--- a/test/pragma4.test
+++ b/test/pragma4.test
@@ -174,6 +174,7 @@ do_test 4.3.4 {
   execsql { DROP INDEX i1 } db3
   execsql { DROP INDEX i2 } db2
 } {}
+if {[permutation]=="prepare"} { catchsql { SELECT * FROM sqlite_master } }
 ifcapable vtab {
   do_execsql_test 4.3.5 { SELECT * FROM pragma_index_info('i1') } 
   do_execsql_test 4.3.6 { SELECT * FROM pragma_index_info('i2') } 
@@ -192,6 +193,9 @@ do_test 4.4.3 {
   execsql { DROP INDEX i1 } db3
   execsql { DROP INDEX i2 } db2
 } {}
+if {[permutation]=="prepare"} { 
+  catchsql { SELECT * FROM sqlite_master, aux.sqlite_master }
+}
 ifcapable vtab {
   do_execsql_test 4.4.5 { SELECT * FROM pragma_index_list('t1') } {}
   do_execsql_test 4.4.6 { SELECT * FROM pragma_index_list('t2') } {}
@@ -216,6 +220,9 @@ do_test 4.5.3 {
   execsql { DROP TABLE c1 } db3
   execsql { DROP TABLE c2 } db2
 } {}
+if {[permutation]=="prepare"} { 
+  catchsql { SELECT * FROM sqlite_master, aux.sqlite_master }
+}
 ifcapable vtab {
   do_execsql_test 4.5.4 { SELECT * FROM pragma_foreign_key_list('c1') }
   do_execsql_test 4.5.5 { SELECT * FROM pragma_foreign_key_list('c2') }