From: drh <>
Date: Wed, 28 Aug 2024 09:47:29 +0000 (+0000)
Subject: Disable shell test cases that require virtual tables when testfixture is
X-Git-Tag: version-3.47.0~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a88d61824dfa5d896cf13eed7c984a09d1d5bd0c;p=thirdparty%2Fsqlite.git

Disable shell test cases that require virtual tables when testfixture is
built using SQLITE_OMIT_VIRTUALTABLE.

FossilOrigin-Name: 8c73d54fd1e250fcd7f30741cfbd169af9aaecc2096c0c8a9486abaa064d69af
---

diff --git a/manifest b/manifest
index a21b754312..60890f8056 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reenable\sSQLITE_OMIT_VIRTUALTABLE\son\sthe\sDevice-One\salignment\sfor\stestrunner.
-D 2024-08-28T09:31:17.887
+C Disable\sshell\stest\scases\sthat\srequire\svirtual\stables\swhen\stestfixture\sis\nbuilt\susing\sSQLITE_OMIT_VIRTUALTABLE.
+D 2024-08-28T09:47:29.176
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1626,10 +1626,10 @@ F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8e
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
 F test/shell1.test 490bf9d0c7c9564fea318c46d49369f4690b825b584c9a544dbdccf61bc0babc
-F test/shell2.test 56da24128304c9ab67da2964cc80beff7b35761c446ec6e6e98bff2775b15026
+F test/shell2.test 01a01f76ed98088ce598794fbf5b359e148271541a8ddbf79d21cc353cc67a24
 F test/shell3.test db1953a8e59d08e9240b7cc5948878e184f7eb2623591587f8fd1f1a5bd536d8
 F test/shell4.test 522fdc628c55eff697b061504fb0a9e4e6dfc5d9087a633ab0f3dd11bcc4f807
-F test/shell5.test bafa4c0b67b7a8027e729970a625c9225cb7ef854acc4e52624c45074faaaddf
+F test/shell5.test 0e5f8ce08206b9998a778cfe1989e20e47839153c05af2da29198150172e22fc
 F test/shell6.test e3b883b61d4916b6906678a35f9d19054861123ad91b856461e0a456273bdbb8
 F test/shell7.test 43fd8e511c533bab5232e95c7b4be93b243451709e89582600d4b6e67693d5c3
 F test/shell8.test aea51ecbcd4494c746b096aeff51d841d04d5f0dc4b62eb42427f16109b87acd
@@ -2211,8 +2211,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 1f962ffc9e956a9d6311ed9c02fea13c0fe056283ee2c650a2312a258808b3b3
-R 8e623cc4a65f73a6029848f64a42525f
+P 8f2cb357634ec0b5aef14f3d967e76db236f8899f3201efc80c264f548cc1b0b
+R 6d8d08b44812eef81a87de61d7679ec8
 U drh
-Z 1895efedce008ae727a6effa6ee80029
+Z 9d65cc1858f9f46a1f30863c1abce3fa
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 59d2cc678e..fb2482f0ae 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f2cb357634ec0b5aef14f3d967e76db236f8899f3201efc80c264f548cc1b0b
+8c73d54fd1e250fcd7f30741cfbd169af9aaecc2096c0c8a9486abaa064d69af
diff --git a/test/shell2.test b/test/shell2.test
index c6c27d2165..ee5ae4bdd9 100644
--- a/test/shell2.test
+++ b/test/shell2.test
@@ -217,6 +217,7 @@ do_test shell2-1.4.9 {
 done
 2}}
 
+ifcapable vtab {
 # Verify that generate_series stays sane near 64-bit range boundaries.
 # See overflow report at https://sqlite.org/forum/forumpost/5d34ce5280
 do_test shell2-1.4.10 {
@@ -247,7 +248,9 @@ do_test shell2-1.4.10 {
 0
 1
 2}}
+}  ;# ifcapable vtab
 
+ifcapable vtab {
 # Bug discovered while messing around, .import hangs with
 # bit 7 set in column separator.
 do_test shell2-1.4.11 {
@@ -262,6 +265,7 @@ do_test shell2-1.4.11 {
 .import dummy.csv t
  SELECT count(*) FROM t;}]]
 } {0 1}
+} ;# ifcapable vtab
 
 # Bug from forum post 7cbe081746dd3803
 # Keywords as column names were producing an error message.
diff --git a/test/shell5.test b/test/shell5.test
index 31d5449fdc..8eb905974b 100644
--- a/test/shell5.test
+++ b/test/shell5.test
@@ -84,6 +84,14 @@ do_test shell5-1.4.1 {
 .import FOO t1}]
 } {1 {Error: cannot open "FOO"}}
 
+# the remainder of these test cases require virtual tables.
+#
+ifcapable !vtab {
+  puts "Skipping subsequent tests due to SQLITE_OMIT_VIRTUALTABLE"
+  finish_test
+  return
+}
+
 # empty import file
 do_test shell5-1.4.2 {
   forcedelete shell5.csv