Fix minor test script problems.

FossilOrigin-Name: 5d54cd44d076cfede60bd404a59bd700a950420b961ae9fdec4365a3e4ed18ed

diff --git a/manifest b/manifest
index 0a629e359e01c0ba2f7ab827638cf398f129c963..d8ee5f2d1be342ac3232addfb1d801f4bc9a2076 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sharmless\scompiler\swarning.
-D 2020-08-09T17:58:45.882
+C Fix\sminor\stest\sscript\sproblems.
+D 2020-08-10T10:43:43.819
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1183,7 +1183,7 @@ F test/misc3.test cf3dda47d5dda3e53fc5804a100d3c82be736c9d
 F test/misc4.test 10cd6addb2fa9093df4751a1b92b50440175dd5468a6ec84d0386e78f087db0e
 F test/misc5.test c4aeaa0fa28faa08f2485309c38db4719e6cd1364215d5687a5b96d340a3fa58
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test 4f21954012e4eb0a923c54a311f38c81bf6798ccdd7b51584db46d4007f63daa
+F test/misc7.test 7b4c88c1d5ea8c8b9d537d212c08a0343d345fdd5c789598692c1c0e60fbda69
 F test/misc8.test 8782708f4c8a459591c3e8fe1215bd2048bffb4024b3df249e9b9ed407dc61ed
 F test/misuse.test 9e7f78402005e833af71dcab32d048003869eca5abcaccc985d4f8dc1d86bcc7
 F test/mjournal.test 28a08d5cb5fb5b5702a46e19176e45e964e0800d1f894677169e79f34030e152
@@ -1243,12 +1243,12 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 94bfbc9d32449fb3ef7d31962f8cdcd57dc59490681db84bd72236d4af7b5815
+F test/permutations.test 4d174cfc92e31aff96a383dac767a94d649566b73857875afb7511e3e430d5f5
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test 50b91bedea9324d3ab48e793f908ee7d2c7dcf84bfa2281e792838be59641ec8
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
-F test/pragma4.test 10c624e45a83c0096a82a7579a5ff658542391d3b77355192da6572c8c17c00b
+F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
 F test/pragma5.test 7b33fc43e2e41abf17f35fb73f71b49671a380ea92a6c94b6ce530a25f8d9102
 F test/pragmafault.test 275edaf3161771d37de60e5c2b412627ac94cef11739236bec12ed1258b240f8
 F test/prefixes.test b524a1c44bffec225b9aec98bd728480352aa8532ac4c15771fb85e8beef65d9
@@ -1879,7 +1879,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 13d2fed760e7d0def573c56b7181f45622b0ed78d61952a6de901f96949d074e
-R d39f49f96174d69a8b9440af3c86a6c6
-U drh
-Z a51d045a11d03da0c517cdccb709af8f
+P 6f91769fdb0734905f05e1f4d1c81364e6e874450c9f13a0de2259d564f582a7
+R 2a9964d9daffbd01d0e0b1d2f41fad0d
+U dan
+Z 4ce6b6d8f83be3ef4531e583afe165de

diff --git a/manifest.uuid b/manifest.uuid
index d1f02b1399ca84b6251785e3c0cc303f95f52afc..950e5d98a9dd49f408c1eedf7e8e345dff833f6f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6f91769fdb0734905f05e1f4d1c81364e6e874450c9f13a0de2259d564f582a7
\ No newline at end of file
+5d54cd44d076cfede60bd404a59bd700a950420b961ae9fdec4365a3e4ed18ed
\ No newline at end of file

diff --git a/test/misc7.test b/test/misc7.test
index e75a6840991e4564ea7321e2f9f2c4037596323f..25f96af34ca51a0188285b8d0ab163d293774837 100644 (file)
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -455,12 +455,13 @@ if {$tcl_platform(platform)!="windows"} {
       catchsql {
         SELECT count(*) FROM t3;
       } 
-    } {1 {database disk image is malformed}}
+    } {1 {malformed database schema (t3) - invalid rootpage}}
   }
 }
 
 # Ticket #2470
 #
+reset_db
 do_test misc7-18.1 {
   execsql {
     CREATE TABLE table_1 (col_10);

diff --git a/test/permutations.test b/test/permutations.test
index ba7fa2be8690ca6e4b7964de2018f5694c3e9500..135f2e83c082395c1025ac54406bff328cca988a 100644 (file)
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -974,6 +974,7 @@ test_suite "journaltest" -description {
   pager1.test syscall.test tkt3457.test *malloc* mmap* multiplex* nolock*
   pager2.test *fault* rowal* snapshot* superlock* symlink.test
   delete_db.test shmlock.test chunksize.test
+  busy2.test
 }]
 
 if {[info commands register_demovfs] != ""} {

diff --git a/test/pragma4.test b/test/pragma4.test
index 2eef060b6c33d2fd00abc6944dae211f1cdb35a1..b82df81cbde0635e2f73b40bed7756a439f3d6c5 100644 (file)
--- a/test/pragma4.test
+++ b/test/pragma4.test
@@ -120,8 +120,15 @@ do_test 4.1.4 {
   sqlite3 db2 test.db2
   execsql { DROP TABLE t1 } db3
   execsql { DROP TABLE t2 } db2
-} {}
-do_execsql_test 4.1.5 { PRAGMA table_info(t1) }
+} {}  
+if {[permutation]=="prepare"} {
+  do_catchsql_test 4.1.5a { 
+    PRAGMA table_info(t1) 
+  } {1 {database schema has changed}}
+}
+do_execsql_test 4.1.5 { 
+  PRAGMA table_info(t1) 
+}
 do_execsql_test 4.1.6 { PRAGMA table_info(t2) }
 
 db2 close