From: dan <dan@noemail.net>
Date: Sat, 8 Aug 2020 20:03:12 +0000 (+0000)
Subject: Changes to busy2.test, corruptL.test and fkey5.test so that new test cases pass with... 
X-Git-Tag: version-3.33.0~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47d38e2444431b84f384917bad6c0495d041546b;p=thirdparty%2Fsqlite.git

Changes to busy2.test, corruptL.test and fkey5.test so that new test cases pass with all test permutations.

FossilOrigin-Name: d62d1711e2b0f18bb4dfb8899299c8e5b4c8205989b719699da60bcfe1884cf3
---

diff --git a/manifest b/manifest
index 3acb21f6b5..759705c252 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sproblem\scausing\san\serror\sfor\sSQLITE_ENABLE_OVERSIZE_CELL_CHECK\sbuilds\sin\scorruptL.test.
-D 2020-08-08T19:52:53.042
+C Changes\sto\sbusy2.test,\scorruptL.test\sand\sfkey5.test\sso\sthat\snew\stest\scases\spass\swith\sall\stest\spermutations.
+D 2020-08-08T20:03:12.538
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -728,7 +728,7 @@ F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
 F test/btree02.test 7555a5440453d900410160a52554fe6478af4faf53098f7235f1f443d5a1d6cc
 F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
 F test/busy.test 510dc6daaad18bcbbc085bcc6217d6dc418def5e73f72ce1475eea0cb7834727
-F test/busy2.test 415364312743992641f9bf679c84918327296067f85a5d00012b339dc35acbd7
+F test/busy2.test d9b2e9548a839b70da2e58ee6f72b816444f764ed7a778a5dc606692a1ac2652
 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
 F test/cachespill.test 895997f84a25b323b166aecb69baab2d6380ea98f9e0bcc688c4493c535cfab9
@@ -783,7 +783,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 0b968228ba7647974544518534699825b076b791e0a85d1c7c99a534491a420e
+F test/corruptL.test 40d78fdfa5f3827e4ca6dc0db6956ca634d4ad48d8ffd2c817d2710fcf79bd99
 F test/corruptM.test 7d574320e08c1b36caa3e47262061f186367d593a7e305d35f15289cc2c3e067
 F test/cost.test 1d156ce9858780a966c062694687afe0343a0ed12d081d071fb57027e726bafc
 F test/count.test e0699a15712bc2a4679d60e408921c2cce7f6365a30340e790c98e0f334a9c77
@@ -882,7 +882,7 @@ F test/fkey1.test d11dbb8a93ead9b5c46ae5d02da016d61245d47662fb2d844c99214f6163f7
 F test/fkey2.test b1b6a8c5556dc0ccf31291b1fed8aa57e404b38f3236110e19ab4dc6aa93edf2
 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
-F test/fkey5.test 7309d9a42b8fefb9bb9197d0d3f0acbfd15b74767c4640305310adafe97e51c8
+F test/fkey5.test 6727452e163a427147e84e739da18713da553d79f9783559b04fdcd36d5c7421
 F test/fkey6.test d078a1e323a740062bed38df32b8a736fd320dc0
 F test/fkey7.test 64fb28da03da5dfe3cdef5967aa7e832c2507bf7fb8f0780cacbca1f2338d031
 F test/fkey8.test 48ef829d63f5f7b37aabd4df9363ac05f65539d1da8c4a44251631769d920579
@@ -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 41474548ef3f7454e44fbf648429730b3f5ba1ff0086fd2f2d0e59b8f51d85e6
-R 58508823ad9b0df104425db9a508f537
+P a85520e0074d574cb4ac5239bb225f8f0b0b3ea1d782cd1cbc79797b4c583fb0
+R 211abeed314e97c0c272d3a023b2a330
 U dan
-Z 99aa34708ee9f0a8283e329595fbd6b4
+Z b8b57186e94948de87cb22a6a4950892
diff --git a/manifest.uuid b/manifest.uuid
index 9667f1e233..06049cd5ca 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a85520e0074d574cb4ac5239bb225f8f0b0b3ea1d782cd1cbc79797b4c583fb0
\ No newline at end of file
+d62d1711e2b0f18bb4dfb8899299c8e5b4c8205989b719699da60bcfe1884cf3
\ No newline at end of file
diff --git a/test/busy2.test b/test/busy2.test
index e1f8eeeff0..a0c377f5a5 100644
--- a/test/busy2.test
+++ b/test/busy2.test
@@ -61,6 +61,7 @@ do_multiclient_test tn {
   #
   do_test 2.$tn.0 {
     sql1 {
+      PRAGMA auto_vacuum = off;
       PRAGMA journal_mode = wal;
       CREATE TABLE t1(a, b);
       INSERT INTO t1 VALUES(1, 2);
diff --git a/test/corruptL.test b/test/corruptL.test
index 09a17ef164..0dc99fe458 100644
--- a/test/corruptL.test
+++ b/test/corruptL.test
@@ -1287,8 +1287,10 @@ do_execsql_test 16.0 {
   ) WHERE type = 'index';
 }
 
+extra_schema_checks 0
 db close
 sqlite3 db test.db
+extra_schema_checks 1
 
 do_catchsql_test 16.1 {
   PRAGMA writable_schema = ON;
diff --git a/test/fkey5.test b/test/fkey5.test
index 9278a7a755..d467a64281 100644
--- a/test/fkey5.test
+++ b/test/fkey5.test
@@ -453,36 +453,40 @@ do_execsql_test 12.1 {
 # 2020-07-03: the pragma_foreign_key_check virtual table should
 # accept arguments for the table name and/or schema name.
 #
-do_execsql_test 13.0 {
-  SELECT *, 'x' FROM pragma_foreign_key_check('t1');
-} {t1 9 t2 0 x}
-do_catchsql_test 13.1 {
-  SELECT *, 'x' FROM pragma_foreign_key_check('t1','main');
-} {1 {no such table: main.t1}}
-do_execsql_test 13.2 {
-  SELECT *, 'x' FROM pragma_foreign_key_check('t1','aux');
-} {t1 9 t2 0 x}
+ifcapable vtab {
+  do_execsql_test 13.0 {
+    SELECT *, 'x' FROM pragma_foreign_key_check('t1');
+  } {t1 9 t2 0 x}
+  do_catchsql_test 13.1 {
+    SELECT *, 'x' FROM pragma_foreign_key_check('t1','main');
+  } {1 {no such table: main.t1}}
+  do_execsql_test 13.2 {
+    SELECT *, 'x' FROM pragma_foreign_key_check('t1','aux');
+  } {t1 9 t2 0 x}
+}
 
-reset_db
-do_execsql_test 13.10 {
-  PRAGMA foreign_keys=OFF;
-  CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT REFERENCES t2);
-  CREATE TABLE t2(x TEXT PRIMARY KEY, y INT);
-  CREATE TABLE t3(w TEXT, z INT REFERENCES t1);
-  INSERT INTO t2 VALUES('abc',11),('def',22),('xyz',99);
-  INSERT INTO t1 VALUES(5,'abc'),(7,'xyz'),(9,'oops');
-  INSERT INTO t3 VALUES(11,7),(22,19);
-} {}
-do_execsql_test 13.11 {
-  SELECT x.*, '|'
-    FROM sqlite_schema, pragma_foreign_key_check(name) AS x
-   WHERE type='table'
-   ORDER BY x."table";
-} {t1 9 t2 0 | t3 2 t1 0 |}
-do_execsql_test 13.12 {
-  SELECT *, '|'
-    FROM pragma_foreign_key_check AS x
-   ORDER BY x."table";
-} {t1 9 t2 0 | t3 2 t1 0 |}
+ifcapable vtab {
+  reset_db
+    do_execsql_test 13.10 {
+      PRAGMA foreign_keys=OFF;
+      CREATE TABLE t1(a INTEGER PRIMARY KEY, b TEXT REFERENCES t2);
+      CREATE TABLE t2(x TEXT PRIMARY KEY, y INT);
+      CREATE TABLE t3(w TEXT, z INT REFERENCES t1);
+      INSERT INTO t2 VALUES('abc',11),('def',22),('xyz',99);
+      INSERT INTO t1 VALUES(5,'abc'),(7,'xyz'),(9,'oops');
+      INSERT INTO t3 VALUES(11,7),(22,19);
+    } {}
+  do_execsql_test 13.11 {
+    SELECT x.*, '|'
+      FROM sqlite_schema, pragma_foreign_key_check(name) AS x
+      WHERE type='table'
+      ORDER BY x."table";
+  } {t1 9 t2 0 | t3 2 t1 0 |}
+  do_execsql_test 13.12 {
+    SELECT *, '|'
+      FROM pragma_foreign_key_check AS x
+      ORDER BY x."table";
+  } {t1 9 t2 0 | t3 2 t1 0 |}
+}
 
 finish_test