Fix some test scripts that were failing with SQLITE_OMIT_VIRTUALTABLE builds.

FossilOrigin-Name: 81c118d90b281b30f40b3eeefaeb2c8350aa40080b4fe7de8f21d263986c6acb
2025-07-30 19:03:16 +03:00 · 2023-02-06 10:47:57 +00:00
parent 072f48e556
commit e734207a79
10 changed files with 85 additions and 69 deletions
--- a/28
+++ b/28
@ -1,5 +1,5 @@
-C Do\snot\suse\sa\sBloom\sfilter\sif\sany\souter\sloop\slacks\sSTAT1\sdata,\ssince\swithout\nSTAT1\sdata,\sthe\squery\splanner\scannot\smake\san\saccurate\sdetermination\sof\nwhether\sor\snot\sa\sBloom\sfilter\swill\sbe\suseful.\s\sThis\sfixes\sthe\sproblem\nreported\sby\s[forum:/forumpost/56de336385|forum\spost\s56de336385].
-D 2023-02-05T20:29:10.068
+C Fix\ssome\stest\sscripts\sthat\swere\sfailing\swith\sSQLITE_OMIT_VIRTUALTABLE\sbuilds.
+D 2023-02-06T10:47:57.478
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@ -769,7 +769,7 @@ F test/attach2.test 6d1e3a457ce260d6fc8e5945c07fba6c76dc2aa90e1c701f067b50ee88f7
 F test/attach3.test c59d92791070c59272e00183b7353eeb94915976
 F test/attach4.test 00e754484859998d124d144de6d114d920f2ed6ca2f961e6a7f4183c714f885e
 F test/attachmalloc.test 67309af95c6b765c13e7d2279d7fccbef78e6eb0565d75d51cefd5dc88784549
-F test/auth.test 4fbeaa283637dd06e1bec5bf92dc9c39e27ef83fd20844bdcf1a85c0e6fc160d
+F test/auth.test 5b8558a40571ebc55c1581cb7cec3b2348a699542a0a51b83ef21c6a953d95e3
 F test/auth2.test 9eb7fce9f34bf1f50d3f366fb3e606be5a2000a1
 F test/auth3.test 76d20a7fa136d63bcfcf8bcb65c0b1455ed71078d81f22bcd0550d3eb18594ab
 F test/autoanalyze1.test b9cc3f32a990fa56669b668d237c6d53e983554ae80c0604992e18869a0b2dec
@ -840,7 +840,7 @@ F test/capi3c.test 31d3a6778f2d06f2d9222bd7660c41a516d1518a059b069e96ebbeadb5a49
 F test/capi3d.test 8b778794af891b0dca3d900bd345fbc8ebd2aa2aae425a9dccdd10d5233dfbde
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
 F test/carray01.test 23ed7074307c4a829ba5ff2970993a9d87db7c5cdbbe1a2cbef672d0df6d6e31
-F test/cast.test e3a7e452f37efec0df0a89e55aa2f04861ba6613deb16075101414668bf4bb24
+F test/cast.test af2286fdd28f3470b7dcad23977282b8cc117747ad55acff74a770dad3b19398
 F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
 F test/changes.test 9dd8e597d84072122fc8a4fcdea837f4a54a461e6e536053ea984303e8ca937b
 F test/changes2.test d222c0cbf5ab0ac4d7c180594e486c1bf20b2098d33e56ce33b8e12eba6823b9
@ -1372,11 +1372,11 @@ F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305
 F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035ce4b3
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
-F test/pendingrace.test fb997b46d6c144a508fb8025d988a1e511b53d42d24143c57b51de3a405c7490
+F test/pendingrace.test cbdf0f74bc939fb43cebad64dda7a0b5a3941a10b7e9cc2b596ff3e423a18156
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
 F test/permutations.test 8bd6b6db541e2a7f9bb894be99ef5c00526b23762c4a00c574e1cba697495125
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
-F test/pragma.test a74a9c9642e5d7e32f5a2aa77a2ed64ec5b69fecff39d52c4daf5945a2a4de65
+F test/pragma.test aeefa47ba5ebbf4ffc6addc223568d2a95dc7ec3ba3e3c4a26b199e805f94514
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
 F test/pragma3.test 92a46bbea12322dd94a404f49edcfbfc913a2c98115f0d030a7459bb4712ef31
 F test/pragma4.test ca5e4dfc46adfe490f75d73734f70349d95a199e6510973899e502eef2c8b1f8
@ -1437,7 +1437,7 @@ F test/savepoint6.test f41279c5e137139fa5c21485773332c7adb98cd7
 F test/savepoint7.test cde525ea3075283eb950cdcdefe23ead4f700daa
 F test/savepointfault.test f044eac64b59f09746c7020ee261734de82bf9b2
 F test/scanstatus.test 7dbcfd6adc6a8df6abc59f83d6da5a27e1bce0b2f6fa55147c8176d7c44e0450
-F test/scanstatus2.test 719c87a0ac817a67899d3e859923c8bb297ac655617b2dcfb602eb25dd829d45
+F test/scanstatus2.test ad7898854be46065c186d49f242f7bbc4614f21aa626d40a1571a92919dde53a
 F test/schema.test 5dd11c96ba64744de955315d2e4f8992e447533690153b93377dffb2a5ef5431
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
 F test/schema3.test 8ed4ae66e082cdd8b1b1f22d8549e1e7a0db4527a8e6ee8b6193053ee1e5c9ce
@ -1566,7 +1566,7 @@ F test/temptable2.test 76821347810ecc88203e6ef0dd6897b6036ac788e9dd3e6b04fd4d163
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
 F test/tester.tcl 8d54d40a55e12554b4509bc12078b201b233c8e842a7543629094a21b1ba956d
-F test/testrunner.tcl 1ed5d8ce180e2b4716dd0570666d49fc3be60d6313bdc20447682ca2c471567c
+F test/testrunner.tcl 3723cfa0e01b69bc3c6a4c2f4a35f8fcec23e3cd048c5f827fcf15b189d2a92a
 F test/testrunner_data.tcl 8169c68654ac8906833b8a6aadca973358a441ebf88270dd05c153e5f96f76b8
 F test/thread001.test a0985c117eab62c0c65526e9fa5d1360dd1cac5b03bde223902763274ce21899
 F test/thread002.test c24c83408e35ba5a952a3638b7ac03ccdf1ce4409289c54a050ac4c5f1de7502
@ -1867,7 +1867,7 @@ F test/walthread.test 14b20fcfa6ae152f5d8e12f5dc8a8a724b7ef189f5d8ef1e2ceab79f2a
 F test/walvfs.test e1a6ad0f3c78e98b55c3d5f0889cf366cc0d0a1cb2bccb44ac9ec67384adc4a1
 F test/wapp.tcl b440cd8cf57953d3a49e7ee81e6a18f18efdaf113b69f7d8482b0710a64566ec
 F test/wapptest.tcl 1bea58a6a8e68a73f542ee4fca28b771b84ed803bd0c9e385087070b3d747b3c x
-F test/where.test 26c9e2f5db19c7f90e5b70127f664facd30c0e5c496956ea3a533bcda7fad74a
+F test/where.test 59abb854eee24f166b5f7ba9d17eb250abc59ce0a66c48912ffb10763648196d
 F test/where2.test 03c21a11e7b90e2845fc3c8b4002fc44cc2797fa74c86ee47d70bd7ea4f29ed6
 F test/where3.test 5b4ffc0ac2ea0fe92f02b1244b7531522fe4d7bccf6fa8741d54e82c10e67753
 F test/where4.test 4a371bfcc607f41d233701bdec33ac2972908ba8
@ -1913,7 +1913,7 @@ F test/window8.tcl 5e02e41d9d9a80f597063aed1a381eb19d1d0ef677a4f0df352c5365cf23f
 F test/window8.test 4ab16817414af0c904abe2ebdf88eb6c2b00058b84f9748c6174ff11fc45f1ed
 F test/window9.test 349c71eab4288a1ffc19e2f65872ec2c37e6cf8a1dda2ad300364b7450ae4836
 F test/windowA.test 6d63dc1260daa17141a55007600581778523a8b420629f1282d2acfc36af23be
-F test/windowB.test cf1278912c7a059763c49cbd6e1b3213b5e9b9d87a5b22714c63808fc33bc8d5
+F test/windowB.test aad7c31739999f68a98a813cfd78390918fc70f56d2d925317a1523cab548ecf
 F test/windowC.test 6fd75f5bb2f1343d34e470e36e68f0ff638d8a42f6aa7d99471261b31a0d42f2
 F test/windowD.test 65cf5a765fb8072450e8a0de2979ce7f09a38d87724fe1280c6444073e3da49b
 F test/windowE.test 6ba0c8048e4cc02b942e56640f8fcd50fd7ca72c876656c40f6baf42e316684c
@ -2048,8 +2048,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c81398c6215d6d1bc7a15b6be9bb1f81effd430ff0a7c86158372accfa77814c
-R 76ab5fe24f1c252174fbac9c48cfe270
-U drh
-Z 69f390e1536f7fb542731649e7e89600
+P e6ab96bd0b9efc51fd703bf7e92b079943ad9a3b92183d434adc11fb7d238afb
+R ec14b36542bc3d333822d319f9c0e8cc
+U dan
+Z 9bfa1895edd5c830bdaa8a26ed2249d1
 # Remove this line to create a well-formed Fossil manifest.
--- a/manifest.uuid
+++ b/manifest.uuid
@ -1 +1 @@
-e6ab96bd0b9efc51fd703bf7e92b079943ad9a3b92183d434adc11fb7d238afb
+81c118d90b281b30f40b3eeefaeb2c8350aa40080b4fe7de8f21d263986c6acb
--- a/test/auth.test
+++ b/test/auth.test
@ -2250,6 +2250,7 @@ ifcapable altertable&&vtab {
 # The sqlite3_declare_vtab() call that occurs during pragma_table_list
 # should not cause an authentication failure.
 #
+ifcapable vtab {
  do_test auth-1.359 {
    proc auth {code arg1 arg2 arg3 arg4 args} {
      if {$code=="SQLITE_UPDATE"} {
@ -2259,6 +2260,7 @@ do_test auth-1.359 {
    }
    catchsql {SELECT * FROM pragma_table_list WHERE name='xyzzy';}
  } {0 {}}
+}

 do_test auth-2.1 {
  proc auth {code arg1 arg2 arg3 arg4 args} {
--- a/test/cast.test
+++ b/test/cast.test
@ -539,6 +539,7 @@ do_execsql_test cast-10.6 {
  SELECT * FROM dual CROSS JOIN (SELECT CAST(44 AS REAL) AS 'm'
                                 UNION ALL SELECT 55);
 } {X 44.0 X 55}
+ifcapable vtab {
  do_execsql_test cast-10.7 {
    DROP VIEW v1;
    CREATE VIEW v1 AS SELECT CAST(44 AS REAL) AS 'm' UNION ALL SELECT 55;
@ -554,5 +555,6 @@ do_execsql_test cast-10.9 {
  do_execsql_test cast-10.10 {
    SELECT * FROM v2;
  } {44.0 55}
+}

 finish_test
--- a/test/pendingrace.test
+++ b/test/pendingrace.test
@ -40,8 +40,11 @@ do_execsql_test 1.0 {
    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10
  )
  INSERT INTO t1 SELECT hex(randomblob(100)), hex(randomblob(100)) FROM s;
-  PRAGMA page_count;
-} {20}
+} {}
+do_test 1.1a {
+  set nPg [db one { PRAGMA page_count }]
+  expr ($nPg==20 || $nPg==21)
+} 1

 # Simulate a crash in another process. This leaves the db with a hot-journal.
 # Without the journal the db is corrupt.
--- a/test/pragma.test
+++ b/test/pragma.test
@ -622,6 +622,9 @@ do_execsql_test pragma-3.40 {
     SET rootpage=(SELECT rootpage FROM saved_schema WHERE name='t1bcd')
   WHERE name='t2bcd';
  PRAGMA Writable_schema=RESET;
+}
+ifcapable vtab {
+  do_execsql_test pragma-3.41 {
    SELECT integrity_check AS x FROM pragma_integrity_check ORDER BY 1;
  } {
    {row 2 missing from index t1bcd}
@ -633,6 +636,7 @@ do_execsql_test pragma-3.40 {
    {row 5 values differ from index t1bcd}
    {row 5 values differ from index t2bcd}
  }
+}
 db eval {DROP TABLE t2}

 # Test modifying the cache_size of an attached database.
--- a/test/scanstatus2.test
+++ b/test/scanstatus2.test
@ -139,6 +139,7 @@ QUERY (nCycle=nnn)
 }

 #-------------------------------------------------------------------------
+ifcapable fts5 {
  reset_db
  do_execsql_test 2.0 {
    CREATE VIRTUAL TABLE ft USING fts5(a);
@ -153,6 +154,7 @@ do_graph_test 2.1 {
  QUERY (nCycle=nnn)
  --SCAN ft VIRTUAL TABLE INDEX 0:M1 (nCycle=nnn)
  }
+}

 #-------------------------------------------------------------------------
 reset_db
--- a/test/testrunner.tcl
+++ b/test/testrunner.tcl
@ -312,6 +312,7 @@ if {[llength $argv]==1
    puts "Failures: "
    mydb eval {
      SELECT build, config, filename FROM script WHERE state='failed'
+      ORDER BY 3
    } {
      display_job $build $config $filename
    }
--- a/test/where.test
+++ b/test/where.test
@ -1620,6 +1620,7 @@ do_execsql_test where-28.1 {

 # 2022-12-07 Yong Heng [https://sqlite.org/forum/forumpost/dfe8084751]
 #
+ifcapable vtab {
  do_execsql_test where-29.1 {
    SELECT DISTINCT 'xyz' FROM pragma_cache_size
      WHERE rowid OR abs(0)
@ -1632,6 +1633,7 @@ do_execsql_test where-29.1 {
      1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
      1, 1, 1, 1;
  } {xyz}
+}

 # 2023-01-30
 # Tests case for the query planner performance issue reported by
--- a/test/windowB.test
+++ b/test/windowB.test
@ -410,7 +410,7 @@ do_execsql_test 10.3 {
  one,two
 }

-ifcapable json1 {
+ifcapable json1&&vtab {
 if {[permutation]!="no_optimization"} {

  do_execsql_test 11.0 {