Do not run merge1.test with SQLITE_OMIT_VIRTUALTABLE builds.

FossilOrigin-Name: bf8dbfd499e732f14c7a8efee527e8ce155937dbb2a3e85213f8aa64ac497189

diff --git a/manifest b/manifest
index 7b39b60427f76a61475945d3e174c03a10ba6e34..99c429946293e387a20e40e9f519699e9e095bf7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spossible\suser-after-free\sin\sALTER\sTABLE\sfound\sby\sasan.
-D 2022-02-12T16:02:37.221
+C Do\snot\srun\smerge1.test\swith\sSQLITE_OMIT_VIRTUALTABLE\sbuilds.
+D 2022-02-12T18:56:24.181
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1212,7 +1212,7 @@ F test/memjournal2.test 89a4e0d1084170a281efa4d54c2677599f986f44227f98f7dfae2828
 F test/memleak.test 10b9c6c57e19fc68c32941495e9ba1c50123f6e2
 F test/memsubsys1.test 9e7555a22173b8f1c96c281ce289b338fcba2abe8b157f8798ca195bbf1d347e
 F test/memsubsys2.test 3e4a8d0c05fd3e5fa92017c64666730a520c7e08
-F test/merge1.test c5abf7d4eca25b3d5ee96927efff18efc3cee5a8af54b8415cbddd6d4471fd70
+F test/merge1.test 0ade470d77b689c4a64dc7f736527fcd893140bcafa70af8f7b98523cfb83f16
 F test/minmax.test fe638b55d77d2375531a8f549b338eafcd9adfbd2f72df37ed77d9b26ca0a71a
 F test/minmax2.test cf9311babb6f0518d04e42fd6a42c619531c4309a9dd790a2c4e9b3bc595e0de
 F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354
@@ -1944,8 +1944,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 c57601b51f9b59e9d8f0eb06580fa14f49525e56bd0190c02865e478bd1f48e7
-R d2a62b8276aa68cab3c9ab07a64e195d
+P 9252619d410293ddefd108f5cf81b6fb4932bd3f2ceaaa92abb7542e34f66111
+R 80e8eecaf7636ea102822137f451668f
 U dan
-Z 7c02332c554dccceaabe14199f7f2d03
+Z 534ed5fc79f3b9c855702c93bc92827c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 0d02fd32fca281dc427eb74a123018b55bf45f6c..17e7501d4c772b8d311232e118f8c5e3166a9ce2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9252619d410293ddefd108f5cf81b6fb4932bd3f2ceaaa92abb7542e34f66111
\ No newline at end of file
+bf8dbfd499e732f14c7a8efee527e8ce155937dbb2a3e85213f8aa64ac497189
\ No newline at end of file

diff --git a/test/merge1.test b/test/merge1.test
index e4a7d657b38c8ddfb33925d2b790c23476a882e1..36969e8fc8f7faf503f5d24514508e7f84aaa968 100644 (file)
--- a/test/merge1.test
+++ b/test/merge1.test
@@ -16,6 +16,11 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set testprefix merge1
 
+ifcapable !vtab {
+  finish_test
+  return
+}
+
 load_static_extension db series