Changes to various test scripts so that veryquick.test runs with OMIT_COMPOUND_SELECT...

FossilOrigin-Name: 76bb649ee2633226324130f5898622c348f93769

diff --git a/manifest b/manifest
index 7059003de22775cf63c27baacf818702e27f2d77..bdb31adf3aa74c0798dfe18cff556d163183fc59 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stypo\sin\sthe\stype\sof\sthe\sfchown()\sfunction\sin\sos_unix.c.
-D 2012-02-13T08:50:23.792
+C Changes\sto\svarious\stest\sscripts\sso\sthat\sveryquick.test\sruns\swith\sOMIT_COMPOUND_SELECT\sdefined.
+D 2012-02-13T10:00:35.138
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -312,7 +312,7 @@ F test/boundary3.test 56ef82096b4329aca2be74fa1e2b0f762ea0eb45
 F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983
 F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
-F test/cache.test 754baab2f18089fc9bcba7afaeb4dc907c6c6de2
+F test/cache.test f64136b0893c293d0b910ed057b3b711249099a7
 F test/capi2.test 835d4cee9f542ea50fa8d01f3fe6de80b0627360
 F test/capi3.test 7200dff6acb17b9a4b6f9918f554eaae04968ddd
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
@@ -364,7 +364,7 @@ F test/createtab.test b5de160630b209c4b8925bdcbbaf48cc90b67fe8
 F test/cse.test 277350a26264495e86b1785f34d2d0c8600e021c
 F test/ctime.test 7bd009071e242aac4f18521581536b652b789a47
 F test/date.test a18a2ce81add84b17b06559e82ad7bb91bc6ddff
-F test/dbstatus.test 3e978f8bdb2362a36a4be63c36a59f542c4cc2a3
+F test/dbstatus.test 207e5b63fcb7b9c3bb8e1fdf38ebd4654ad0e54b
 F test/dbstatus2.test dc57b0d9610851c0ff58a8e1b5b191678398b72a
 F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
 F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
@@ -374,28 +374,28 @@ F test/descidx1.test 533dcbda614b0463b0ea029527fd27e5a9ab2d66
 F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
 F test/descidx3.test fe720e8b37d59f4cef808b0bf4e1b391c2e56b6f
 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
-F test/distinct.test 76908ed038c5186ffb8acf5954ed64e22056f311
+F test/distinct.test 8c6d12ba53ee8351a5b2d47628acdfad1fc97743
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
 F test/e_createtable.test 48598b15e8fe6554d301e7b65a10c9851f177e84
-F test/e_delete.test ec168cd4b08d681e6d5847f462203755ad647532
+F test/e_delete.test 89aa84d3d1bd284a0689ede04bce10226a5aeaa5
 F test/e_droptrigger.test afd5c4d27dec607f5997a66bf7e2498a082cb235
 F test/e_dropview.test 583411e470458c5d76148542cfb5a5fa84c8f93e
-F test/e_expr.test 4e4399006b3d1ab333721b8e386cabb9fb6d5a89
-F test/e_fkey.test 38039b840ab19331000b0f0eb1d82baa7208a67a
+F test/e_expr.test 5489424d3d9a452ac3701cdf4b680ae31a157894
+F test/e_fkey.test 057eed81a41a2b21b1790032f4e8aaba0b2b0e17
 F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
-F test/e_insert.test 234242b71855af8e8a9b1e141c3533f6d43d8645
+F test/e_insert.test 92d2dab07366aef112f53af4539e30559f5d35a7
 F test/e_reindex.test dfedfc32c5a282b0596c6537cbcd4217fbb1a216
 F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6
-F test/e_select.test 99202f99a9a3273c6fb0d2e7592b98faeb6c206e
+F test/e_select.test f5d4b81205701deacfae42051ae200969c41d2c0
 F test/e_select2.test 5c3d3da19c7b3e90ae444579db2b70098599ab92
-F test/e_update.test dba988a4d079156549a40854074ba4890b0a4577
+F test/e_update.test 161d5dc6a3ed9dd08f5264d13e20735d7a89f00c
 F test/e_uri.test 6f35b491f80dac005c8144f38b2dfb4d96483596
-F test/e_vacuum.test 5296e25ef871965bac010b9da083dd7e4734526e
+F test/e_vacuum.test 331da289ae186656cf5f2eb27f577a89c0c221af
 F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 796c59832e2b9a52842f382ffda8f3e989db03ad
 F test/enc3.test 90683ad0e6ea587b9d5542ca93568af9a9858c40
 F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
-F test/eqp.test f14fadd76da53405e9885e2431cacf7191d83cdb
+F test/eqp.test 6a389bba6ea113fd5179515001be788a38d53ec7
 F test/errmsg.test 3bb606db9d040cc6854459f8f5e5a2bcd9b7fd2a
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
 F test/exclusive.test a1b324cb21834a490cd052d409d34789cfef57cb
@@ -507,7 +507,7 @@ F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
 F test/fuzzer1.test ddfb04f3bd5cfdda3b1aa15b78d3ad055c9cc50f
 F test/hook.test 5f3749de6462a6b87b4209b74adf7df5ac2df639
 F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
-F test/in.test 19b642bb134308980a92249750ea4ce3f6c75c2d
+F test/in.test a7b8a0f43da81cd08645b7a710099ffe9ad1126b
 F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
 F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
 F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
@@ -526,7 +526,7 @@ F test/index4.test 2983216eb8c86ee62d9ed7cb206b5cc3331c0026
 F test/indexedby.test be501e381b82b2f8ab406309ba7aac46e221f4ad
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
-F test/insert.test d540650825c98d8082d32f786c611d70e1c21a80
+F test/insert.test 489aa12a027c83d291f5034a83c8c32e6be1dca2
 F test/insert2.test 4f3a04d168c728ed5ec2c88842e772606c7ce435
 F test/insert3.test 1b7db95a03ad9c5013fdf7d6722b6cd66ee55e30
 F test/insert4.test 87f6798f31d60c4e177622fcc3663367e6ecbd90
@@ -545,7 +545,7 @@ F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test 86675fc2919269aa923c84dd00ee4249b97990fe
-F test/join6.test bf82cf3f979e9eade83ad0d056a66c5ed71d1901
+F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
 F test/journal1.test 8b71ef1ed5798bdc0e6eb616d8694e2c2c188d4d
 F test/journal2.test ae06f566c28552c313ded3fee79a6c69e6d049b1
 F test/journal3.test 6fd28532c88b447db844186bc190523108b6dbb4
@@ -601,7 +601,7 @@ F test/memsubsys2.test 3a1c1a9de48e5726faa85108b02459fae8cb9ee9
 F test/minmax.test 722d80816f7e096bf2c04f4111f1a6c1ba65453d
 F test/minmax2.test 33504c01a03bd99226144e4b03f7631a274d66e0
 F test/minmax3.test cc1e8b010136db0d01a6f2a29ba5a9f321034354
-F test/minmax4.test c1fa9505fd135007fdb1fb699334fb3d4ea7952e
+F test/minmax4.test 536a3360470633a177e42fbc19660d146b51daef
 F test/misc1.test 55cb2bfbf4a8cd61f4be1effc30426ad41696bff
 F test/misc2.test 00d7de54eda90e237fc9a38b9e5ccc769ebf6d4d
 F test/misc3.test fe55130a43e444ee75e2156ff75dc96e964b5738
@@ -645,7 +645,7 @@ F test/quota.test af47d25c166aa7b33ef25f21bb7f2afb29d82c77
 F test/quota2.test 1b8df088e604f2df573f96e726b5e518cb0cddaa
 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6
 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459
-F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
+F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df
 F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
@@ -654,7 +654,7 @@ F test/rollback.test a1b4784b864331eae8b2a98c189efa2a8b11ff07
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
-F test/savepoint.test e575217b07d6a6e895e66f4eda076570815e0027
+F test/savepoint.test 42ba63b632df4ce1bef8acdba62e4182d6505125
 F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
 F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
@@ -676,7 +676,7 @@ F test/select8.test 391de11bdd52339c30580dabbbbe97e3e9a3c79d
 F test/select9.test 74c0fb2c6eecb0219cbed0cbe3df136f8fbf9343
 F test/selectA.test 06d1032fa9009314c95394f2ca2e60d9f7ae8532
 F test/selectB.test 954e4e49cf1f896d61794e440669e03a27ceea25
-F test/selectC.test f9bf1bc4581b5b8158caa6e4e4f682acb379fb25
+F test/selectC.test 871fb55d884d3de5943c4057ebd22c2459e71977
 F test/server1.test 46803bd3fe8b99b30dbc5ff38ffc756f5c13a118
 F test/shared.test 34945a516532b11182c3eb26e31247eee3c9ae48
 F test/shared2.test 8f71d4eb4d5261280de92284df74172545c852cc
@@ -701,7 +701,7 @@ F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
-F test/stat.test 36bc951bdc2beac4224cc54396fd6a7dc65336f4
+F test/stat.test 08e8185b3fd5b010c90d7ad82b9dd4ea1cbf14b0
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
 F test/subquery.test b524f57c9574b2c0347045b4510ef795d4686796
 F test/subquery2.test edcad5c118f0531c2e21bf16a09bbb105252d4cd
@@ -729,15 +729,15 @@ F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/threadtest3.c 0ed13e09690f6204d7455fac3b0e8ece490f6eef
-F test/tkt-02a8e81d44.test 58494de77be2cf249228ada3f313fa399821c6ab
+F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
 F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
 F test/tkt-2d1a5c67d.test b028a811049eb472cb2d3a43fc8ce4f6894eebda
 F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
 F test/tkt-31338dca7e.test 1f714c14b6682c5db715e0bda347926a3456f7a9
 F test/tkt-313723c356.test c47f8a9330523e6f35698bf4489bcb29609b53ac
-F test/tkt-38cb5df375.test 9e9b19857dba0896a8efdaf334d405ba423492f2
+F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
 F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
-F test/tkt-3a77c9714e.test 1675c22a5be71d7fa026e5db5daeeb4dd64f7824
+F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
 F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
 F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
 F test/tkt-54844eea3f.test a12b851128f46a695e4e378cca67409b9b8f5894
@@ -746,8 +746,8 @@ F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
 F test/tkt-5ee23731f.test 9db6e1d7209dc0794948b260d6f82b2b1de83a9f
 F test/tkt-752e1646fc.test ea78d88d14fe9866bdd991c634483334639e13bf
 F test/tkt-78e04e52ea.test ab52f0c1e2de6e46c910f4cc16b086bba05952b7
-F test/tkt-7bbfb7d442.test 8e7658f77d1ccea9d88dc9e255d3ed7fb68f8bdf
-F test/tkt-80ba201079.test a09684db1a0bd55b8838f606adccee456a51ddbf
+F test/tkt-7bbfb7d442.test dfa5c8097a8c353ae40705d6cddeb1f99c18b81a
+F test/tkt-80ba201079.test 9eb040d81c404f56838a6af93593f42790def63f
 F test/tkt-80e031a00f.test 9a154173461a4dbe2de49cda73963e04842d52f7
 F test/tkt-8454a207b9.test c583a9f814a82a2b5ba95207f55001c9f0cd816c
 F test/tkt-91e2e8ba6f.test 08c4f94ae07696b05c9b822da0b4e5337a2f54c5
@@ -755,15 +755,15 @@ F test/tkt-94c04eaadb.test be5ea61cb04dfdc047d19b5c5a9e75fa3da67a7f
 F test/tkt-9d68c883.test 458f7d82a523d7644b54b497c986378a7d8c8b67
 F test/tkt-b1d3a2e531.test 610ef582413171b379652663111b1f996d9f8f78
 F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
-F test/tkt-b72787b1.test e6b62b2b2785c04d0d698d6a603507e384165049
+F test/tkt-b72787b1.test a95e8cdad0b98af1853ac7f0afd4ab27b77bf5f3
 F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
 F test/tkt-c48d99d690.test bed446e3513ae10eec1b86fdd186ef750226c408
 F test/tkt-cbd054fa6b.test bd9fb546f63bc0c79d1776978d059fa51c5b1c63
 F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
 F test/tkt-d635236375.test 9d37e988b47d87505bc9445be0ca447002df5d09
-F test/tkt-d82e3f3721.test 731359dfdcdb36fea0559cd33fec39dd0ceae8e6
+F test/tkt-d82e3f3721.test bcc0dfba658d15bab30fd4a9320c9e35d214ce30
 F test/tkt-f3e5abed55.test 669bb076f2ac573c7398ce00f40cd0ca502043a9
-F test/tkt-f777251dc7a.test 6f24c053bc5cdb7e1e19be9a72c8887cf41d5e87
+F test/tkt-f777251dc7a.test a3121f92f49af447572f7a3cde9f07806443c75d
 F test/tkt-f7b4edec.test d998a08ff2b18b7f62edce8e3044317c45efe6c7
 F test/tkt-f973c7ac31.test 1da0ed15ec2c7749fb5ce2828cd69d07153ad9f4
 F test/tkt-fa7bf5ec.test 9102dfea58aa371d78969da735f9392c57e2e035
@@ -822,7 +822,7 @@ F test/tkt3461.test 228ea328a5a21e8663f80ee3d212a6ad92549a19
 F test/tkt3493.test 1686cbde85f8721fc1bdc0ee72f2ef2f63139218
 F test/tkt3508.test d75704db9501625c7f7deec119fcaf1696aefb7d
 F test/tkt3522.test 22ce2ebbcb04a6be56c0977d405c207967318fd6
-F test/tkt3527.test ee4af96183579565987e58873a7490bc04934ffb
+F test/tkt3527.test 9e8f28a706c772d5a7cd1020c946fab6c74e3ae0
 F test/tkt3541.test 5dc257bde9bc833ab9cc6844bf170b998dbb950a
 F test/tkt3554.test f599967f279077bace39220cbe76085c7b423725
 F test/tkt3581.test 1966b7193f1e3f14951cce8c66907ae69454e9a3
@@ -833,7 +833,7 @@ F test/tkt3731.test 0c5f4cbffe102d43c3b2188af91a9e36348f974b
 F test/tkt3757.test 10cd679a88675c880533083fc79ac04324525595
 F test/tkt3761.test b95ea9c98f21cf91325f18a984887e62caceab33
 F test/tkt3762.test 2a9f3b03df44ec49ec0cfa8d5da6574c2a7853df
-F test/tkt3773.test 430b06567ce40285dfd2c4834a2a61816403efeb
+F test/tkt3773.test 7bca904d2a647a6a4a291bd86d7fd7c73855b789
 F test/tkt3791.test a6624b9a80b216a26cf473607f42f3e51898c267
 F test/tkt3793.test d90ffd75c52413908d15e1c44fc2ea9c80fcc449
 F test/tkt3810.test 90fa0635dfa7da9680c8cd3513350a49b3a8ae12
@@ -857,7 +857,7 @@ F test/trace2.test 962175290996d5f06dc4402ca218bbfc7df4cb20
 F test/trans.test 6e1b4c6a42dba31bd65f8fa5e61a2708e08ddde6
 F test/trans2.test d5337e61de45e66b1fcbf9db833fa8c82e624b22
 F test/trans3.test d728abaa318ca364dc370e06576aa7e5fbed7e97
-F test/trigger1.test 38524d80ac26c232d23ecec4b037eb60fb67eedd
+F test/trigger1.test de42feb7cd442787d38185ae74f5a1d7afa400cb
 F test/trigger2.test 834187beafd1db383af0c659cfa49b0576832816
 F test/trigger3.test d2c60d8be271c355d61727411e753181e877230a
 F test/trigger4.test 74700b76ebf3947b2f7a92405141eb2cf2a5d359
@@ -899,12 +899,12 @@ F test/vtab9.test ea58d2b95d61955f87226381716b2d0b1d4e4f9b
 F test/vtabA.test c86e1990b7e1e2bb34602a06fffa4c69f2b516dc
 F test/vtabB.test 04df5dc531b9f44d9ca65b9c1b79f12b5922a796
 F test/vtabC.test 4528f459a13136f982e75614d120aef165f17292
-F test/vtabD.test 74167b1578e5886fe4c886d6bef2fd1406444c42
+F test/vtabD.test 05b3f1d77117271671089e48719524b676842e96
 F test/vtabE.test 7c4693638d7797ce2eda17af74292b97e705cc61
 F test/vtabF.test fd5ad376f5a34fe0891df1f3cddb4fe7c3eb077e
 F test/vtab_alter.test 9e374885248f69e251bdaacf480b04a197f125e5
 F test/vtab_err.test 0d4d8eb4def1d053ac7c5050df3024fd47a3fbd8
-F test/vtab_shared.test 0eff9ce4f19facbe0a3e693f6c14b80711a4222d
+F test/vtab_shared.test 82f463886e18d7f8395a4b6167c91815efe54839
 F test/wal.test edefe316b4125d7f68004ea53c5e73c398d436cc
 F test/wal2.test f11883dd3cb7f647c5d2acfd7b5c6d4ba5770cc9
 F test/wal3.test 6504bbf348b2d6dfade64a064f1050fd617e8706
@@ -937,7 +937,7 @@ F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
 F test/where7.test 814d7373413398e074f134cff5f8872e2c08bd3b
 F test/where8.test a6c740fd286d7883e274e17b6230a9d672a7ab1f
 F test/where8m.test da346596e19d54f0aba35ebade032a7c47d79739
-F test/where9.test bed66dcfc69a54a99661c0c9906189cb5e58f4e2
+F test/where9.test cd4ee5e455799ddba7041e5ac539044bb24e3874
 F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/whereC.test 13ff5ec0dba407c0e0c075980c75b3275a6774e5
@@ -989,7 +989,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 98efac9630ca96ba0497c8e206dc5022612ff381
-R c28baf50a89887974b43cddbc49224fb
+P bfbfe05b81919ecc3d6e7be4c24994f795f16582
+R 6250e4472fb78736176921352e48e2f9
 U dan
-Z fe60136d21d83b01836f509b8ebeab38
+Z f0319cf74449ae83da7435ab8330767c

diff --git a/manifest.uuid b/manifest.uuid
index b37b52966ddb1ad3e59f8f7c35e780da6911dbd3..896ec58a386047e41efd5f7377e463f989b17b97 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bfbfe05b81919ecc3d6e7be4c24994f795f16582
\ No newline at end of file
+76bb649ee2633226324130f5898622c348f93769
\ No newline at end of file

diff --git a/test/cache.test b/test/cache.test
index 8d801f05998775228d2c95acc8ba8bcc0ab14196..f81948ba2c6e8cacc8db0fc7b071fe611e3c9a06 100644 (file)
--- a/test/cache.test
+++ b/test/cache.test
@@ -14,7 +14,7 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable {!pager_pragmas} {
+ifcapable !pager_pragmas||!compound {
   finish_test
   return
 }

diff --git a/test/dbstatus.test b/test/dbstatus.test
index 5fc8be0426fa80fbf07040e0a6b69f58f18e54e0..9793df3f4ea0f682d87177fd589d11825aacaae9 100644 (file)
--- a/test/dbstatus.test
+++ b/test/dbstatus.test
@@ -15,6 +15,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 # Memory statistics must be enabled for this test.
 db close
 sqlite3_shutdown

diff --git a/test/distinct.test b/test/distinct.test
index 3fb9c8478aa0ac36b0c916c785d699817fece624..3bc8337942183f06031252273037079946a091d1 100644 (file)
--- a/test/distinct.test
+++ b/test/distinct.test
@@ -15,6 +15,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 set testprefix distinct
 
 

diff --git a/test/e_delete.test b/test/e_delete.test
index 91459810f945e75e13dfb1dae1252f3524ae5426..31bb3249bae1da124c8c81cbdfada3d00321f60a 100644 (file)
--- a/test/e_delete.test
+++ b/test/e_delete.test
@@ -15,6 +15,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 proc do_delete_tests {args} {
   uplevel do_select_tests $args
 }

diff --git a/test/e_expr.test b/test/e_expr.test
index c770f1c4105f92c68cbaf473eda19db5652f73c6..74d0c407129e13f1f72e8f10070e6154dc072afe 100644 (file)
--- a/test/e_expr.test
+++ b/test/e_expr.test
@@ -17,6 +17,10 @@ set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 source $testdir/malloc_common.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
 
 proc do_expr_test {tn expr type value} {
   uplevel do_execsql_test $tn [list "SELECT typeof($expr), $expr"] [

diff --git a/test/e_fkey.test b/test/e_fkey.test
index ae789d50723e59183c29461e284949c87b7e8bdc..5b27e03b5aa12c9569a020019c632c3826651872 100644 (file)
--- a/test/e_fkey.test
+++ b/test/e_fkey.test
@@ -2325,7 +2325,7 @@ do_test e_fkey-51.1 {
 do_test e_fkey-51.2 {
   execsql {
     UPDATE parent SET x = 22;
-    SELECT * FROM parent UNION ALL SELECT 'xxx' UNION ALL SELECT a FROM child;
+    SELECT * FROM parent ; SELECT 'xxx' ; SELECT a FROM child;
   }
 } {22 21 23 xxx 22}
 do_test e_fkey-51.3 {
@@ -2335,7 +2335,7 @@ do_test e_fkey-51.3 {
     INSERT INTO parent VALUES(-1);
     INSERT INTO child VALUES(-1);
     UPDATE parent SET x = 22;
-    SELECT * FROM parent UNION ALL SELECT 'xxx' UNION ALL SELECT a FROM child;
+    SELECT * FROM parent ; SELECT 'xxx' ; SELECT a FROM child;
   }
 } {22 23 21 xxx 23}
 

diff --git a/test/e_insert.test b/test/e_insert.test
index e96b1a6f6e72d24f094f4759d6a95e1086f6aac0..a10d5283de6f5c6079b0c4a586613006b7565845 100644 (file)
--- a/test/e_insert.test
+++ b/test/e_insert.test
@@ -18,6 +18,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 # Organization of tests:
 #
 #   e_insert-0.*: Test the syntax diagram.

diff --git a/test/e_select.test b/test/e_select.test
index 103472cd92982e4554de0226e77b604ee1ccd0fb..e5949af67b1b47b32e887a9788c9106a49aabe90 100644 (file)
--- a/test/e_select.test
+++ b/test/e_select.test
@@ -16,6 +16,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_execsql_test e_select-1.0 {
   CREATE TABLE t1(a, b);
   INSERT INTO t1 VALUES('a', 'one');

diff --git a/test/e_update.test b/test/e_update.test
index 6c0e5f8aa6c894d5f3a3f55bec49ec906b74f18b..230c97fdfae198b8dd0410f4836fe586c41727df 100644 (file)
--- a/test/e_update.test
+++ b/test/e_update.test
@@ -381,11 +381,9 @@ do_execsql_test e_update-2.2.X {
 # attached).
 #
 do_execsql_test e_update-2.3.0 {
-  SELECT 'main', tbl_name FROM main.sqlite_master WHERE type = 'table'
-    UNION ALL
-  SELECT 'temp', tbl_name FROM sqlite_temp_master WHERE type = 'table'
-    UNION ALL
-  SELECT 'aux', tbl_name FROM aux.sqlite_master WHERE type = 'table'
+  SELECT 'main', tbl_name FROM main.sqlite_master WHERE type = 'table';
+  SELECT 'temp', tbl_name FROM sqlite_temp_master WHERE type = 'table';
+  SELECT 'aux', tbl_name FROM aux.sqlite_master WHERE type = 'table';
 } [list {*}{
     main t1
     main t2

diff --git a/test/e_vacuum.test b/test/e_vacuum.test
index aa7870fd10c5f4ce64c41e71ec2eac5979d73683..bad12d3c4d4b6cd1232789a94fa3c763bcdcf578 100644 (file)
--- a/test/e_vacuum.test
+++ b/test/e_vacuum.test
@@ -122,7 +122,7 @@ foreach {tn avmode sz} {
 #   e_vacuum-1.2.4 - Verify that t1 and its indexes are now much 
 #                    less fragmented.
 #
-ifcapable vtab {
+ifcapable vtab&&compound {
   create_db 
   register_dbstat_vtab db
   do_execsql_test e_vacuum-1.2.1 {

diff --git a/test/eqp.test b/test/eqp.test
index 91a18d0026770fb62c9ebb3ddf71c0294fa1cdd1..0e663f0a3848e7a9e0d0981de3d80cb05d3c1429 100644 (file)
--- a/test/eqp.test
+++ b/test/eqp.test
@@ -13,6 +13,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 set testprefix eqp
 
 #-------------------------------------------------------------------------

diff --git a/test/in.test b/test/in.test
index 2c38a0f4caab57517f5ef3e287d9bd1a1d3bc1de..108f35589c91e6709e68a307aa91809c0c9483fd 100644 (file)
--- a/test/in.test
+++ b/test/in.test
@@ -431,6 +431,7 @@ do_test in-12.9 {
 } {1 {SELECTs to the left and right of INTERSECT do not have the same number of result columns}}
 }
 
+ifcapable compound {
 do_test in-12.10 {
   catchsql {
     SELECT * FROM t2 WHERE a IN (
@@ -459,6 +460,7 @@ do_test in-12.13 {
     );
   }
 } {1 {only a single result allowed for a SELECT that is part of an expression}}
+}; #ifcapable compound
 
 
 #------------------------------------------------------------------------

diff --git a/test/insert.test b/test/insert.test
index 05718d556fcb359e82c5afc11843df79b1a585a6..e00b9a80289730f1c03c6fb700956418643a3e2c 100644 (file)
--- a/test/insert.test
+++ b/test/insert.test
@@ -388,18 +388,20 @@ do_test insert-9.2 {
 
 # Multiple VALUES clauses
 #
-do_test insert-10.1 {
-  execsql {
-    CREATE TABLE t10(a,b,c);
-    INSERT INTO t10 VALUES(1,2,3), (4,5,6), (7,8,9);
-    SELECT * FROM t10;
-  }
-} {1 2 3 4 5 6 7 8 9}
-do_test insert-10.2 {
-  catchsql {
-    INSERT INTO t10 VALUES(11,12,13), (14,15);
-  }
-} {1 {all VALUES must have the same number of terms}}
+ifcapable compound {
+  do_test insert-10.1 {
+    execsql {
+      CREATE TABLE t10(a,b,c);
+      INSERT INTO t10 VALUES(1,2,3), (4,5,6), (7,8,9);
+      SELECT * FROM t10;
+    }
+  } {1 2 3 4 5 6 7 8 9}
+  do_test insert-10.2 {
+    catchsql {
+      INSERT INTO t10 VALUES(11,12,13), (14,15);
+    }
+  } {1 {all VALUES must have the same number of terms}}
+}
 
 integrity_check insert-99.0
 

diff --git a/test/join6.test b/test/join6.test
index 4f65dcb44666eaa2ed0bc9c1dd9990e52f42196b..7fbf508e57f6ab6bb25eabcc77826fb3c5380d1b 100644 (file)
--- a/test/join6.test
+++ b/test/join6.test
@@ -124,26 +124,28 @@ do_test join6-3.6 {
   }
 } {1 91 92 3 93 5 91 2 93 94 4 95 6 99}
 
-do_test join6-4.1 {
-  execsql {
-    SELECT * FROM
-       (SELECT 1 AS a, 91 AS x, 92 AS y UNION SELECT 2, 93, 94)
-       NATURAL JOIN t2 NATURAL JOIN t3
-  }
-} {1 91 92 3 93 5}
-do_test join6-4.2 {
-  execsql {
-    SELECT * FROM t1 NATURAL JOIN
-       (SELECT 3 AS b, 92 AS y, 93 AS z UNION SELECT 4, 94, 95)
-       NATURAL JOIN t3
-  }
-} {1 91 92 3 93 5}
-do_test join6-4.3 {
-  execsql {
-    SELECT * FROM t1 NATURAL JOIN t2 NATURAL JOIN
-       (SELECT 5 AS c, 91 AS x, 93 AS z UNION SELECT 6, 99, 95)
-  }
-} {1 91 92 3 93 5}
+ifcapable compound {
+  do_test join6-4.1 {
+    execsql {
+      SELECT * FROM
+         (SELECT 1 AS a, 91 AS x, 92 AS y UNION SELECT 2, 93, 94)
+         NATURAL JOIN t2 NATURAL JOIN t3
+    }
+  } {1 91 92 3 93 5}
+  do_test join6-4.2 {
+    execsql {
+      SELECT * FROM t1 NATURAL JOIN
+         (SELECT 3 AS b, 92 AS y, 93 AS z UNION SELECT 4, 94, 95)
+         NATURAL JOIN t3
+    }
+  } {1 91 92 3 93 5}
+  do_test join6-4.3 {
+    execsql {
+      SELECT * FROM t1 NATURAL JOIN t2 NATURAL JOIN
+         (SELECT 5 AS c, 91 AS x, 93 AS z UNION SELECT 6, 99, 95)
+    }
+  } {1 91 92 3 93 5}
+}
 
 
 

diff --git a/test/minmax4.test b/test/minmax4.test
index 12f56a86c3f09a6df34f741cbc8535bdf794a056..0d8305b5ff3779d45fff92ff4d8eeb72105845c3 100644 (file)
--- a/test/minmax4.test
+++ b/test/minmax4.test
@@ -20,6 +20,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test minmax4-1.1 {
   db eval {
     CREATE TABLE t1(p,q);

diff --git a/test/randexpr1.test b/test/randexpr1.test
index 10a1d17c399a51b667f1bcec9f43fb4f59ab44aa..7a98f0be0fdbce4aabda03d21709a3d4f3821205 100644 (file)
--- a/test/randexpr1.test
+++ b/test/randexpr1.test
@@ -22,6 +22,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 # Create test data
 #
 do_test randexpr1-1.1 {

diff --git a/test/savepoint.test b/test/savepoint.test
index 3bbbaaae31aa59c47323ea6a591e6314e763d1d3..6163e2e8a9034f6003b5ffe39b0031bcb8be41f3 100644 (file)
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -649,10 +649,8 @@ if {[wal_is_wal_mode]==0} {
       CREATE TABLE main.t1(x, y);
       CREATE TABLE aux1.t2(x, y);
       CREATE TABLE aux2.t3(x, y);
-      SELECT name FROM sqlite_master 
-        UNION ALL
-      SELECT name FROM aux1.sqlite_master 
-        UNION ALL
+      SELECT name FROM sqlite_master;
+      SELECT name FROM aux1.sqlite_master;
       SELECT name FROM aux2.sqlite_master;
     }
   } {t1 t2 t3}
@@ -691,7 +689,7 @@ if {[wal_is_wal_mode]==0} {
     execsql { PRAGMA lock_status }
   } [list main reserved temp $templockstate aux1 reserved aux2 reserved]
   do_test savepoint-10.2.9 {
-    execsql { SELECT 'a', * FROM t1 UNION ALL SELECT 'b', * FROM t3 }
+    execsql { SELECT 'a', * FROM t1 ; SELECT 'b', * FROM t3 }
   } {a 1 2 b 3 4}
   do_test savepoint-10.2.9 {
     execsql {

diff --git a/test/selectC.test b/test/selectC.test
index fd384053ce45b496c64bd4d220eee2daa3ce8ff5..dedac41fc474dd816bf798a114fbdbcd4cc159c3 100644 (file)
--- a/test/selectC.test
+++ b/test/selectC.test
@@ -151,7 +151,7 @@ do_test selectC-1.14.2 {
 
 # The following query used to leak memory.  Verify that has been fixed.
 #
-ifcapable trigger {
+ifcapable trigger&&compound {
   do_test selectC-2.1 {
     catchsql {
       CREATE TABLE t21a(a,b);

diff --git a/test/stat.test b/test/stat.test
index 21726eb258665588b518d841f82ae24abb680c00..926d9b7406d8e270a43628ec56b9a24b28075495 100644 (file)
--- a/test/stat.test
+++ b/test/stat.test
@@ -15,7 +15,7 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable !vtab {
+ifcapable !vtab||!compound {
   finish_test
   return
 }

diff --git a/test/tkt-02a8e81d44.test b/test/tkt-02a8e81d44.test
index 4a48fb029e1dc30302b67927d2f5bc9c6358c268..7ca9866414f2bca3c48fb1bfebb6028758c88f53 100644 (file)
--- a/test/tkt-02a8e81d44.test
+++ b/test/tkt-02a8e81d44.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt-02a838-1.1 {
   execsql {
     CREATE TABLE t1(a);

diff --git a/test/tkt-38cb5df375.test b/test/tkt-38cb5df375.test
index 47b0b55106a9e5a7a70948607d37a6689634737d..e5e02671b76d7e97b1c2ae953d3972eb9a7b5a32 100644 (file)
--- a/test/tkt-38cb5df375.test
+++ b/test/tkt-38cb5df375.test
@@ -16,6 +16,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt-38cb5df375.0 {
   execsql {
     CREATE TABLE t1(a);

diff --git a/test/tkt-3a77c9714e.test b/test/tkt-3a77c9714e.test
index d77ee42bb34652d4fc43ddc5e236c4cb6330929e..6eaec16cdd9da87a64bd4a082aaad2194939fdc9 100644 (file)
--- a/test/tkt-3a77c9714e.test
+++ b/test/tkt-3a77c9714e.test
@@ -16,6 +16,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 set testprefix "tkt-3a77c9714e"
 
 do_execsql_test 1.1 {

diff --git a/test/tkt-7bbfb7d442.test b/test/tkt-7bbfb7d442.test
index e560a0d4d59459233e2acc02a366b48d2ebb5999..dcb9b1605801e3427b5b34518f565d6e75dd8b06 100644 (file)
--- a/test/tkt-7bbfb7d442.test
+++ b/test/tkt-7bbfb7d442.test
@@ -49,10 +49,12 @@ do_execsql_test 1.2 {
 
 do_execsql_test 1.3 { DELETE FROM t3 }
 
-do_execsql_test 1.4 {
-  INSERT INTO t3(t3_a) SELECT 1 UNION SELECT 2 UNION SELECT 3;
-  SELECT * FROM t3;
-} {1 I 2 II 3 III}
+ifcapable compound {
+  do_execsql_test 1.4 {
+    INSERT INTO t3(t3_a) SELECT 1 UNION SELECT 2 UNION SELECT 3;
+    SELECT * FROM t3;
+  } {1 I 2 II 3 III}
+}
 
 
 

diff --git a/test/tkt-80ba201079.test b/test/tkt-80ba201079.test
index 95e99b5a5ba37b4652893737a4030a153e23a322..0122e95f2f5a757dd0b4211771f6bf306aa18470 100644 (file)
--- a/test/tkt-80ba201079.test
+++ b/test/tkt-80ba201079.test
@@ -164,11 +164,13 @@ do_execsql_test 303 {
     (b='B' AND c IN (SELECT c FROM t1))
 } {A B C D E}
 
-do_execsql_test 304 {
-  SELECT * FROM t1, t2 WHERE
-    (a='A' AND d='E') OR
-    (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D'))
-} {A B C D E}
+ifcapable compound {
+  do_execsql_test 304 {
+    SELECT * FROM t1, t2 WHERE
+      (a='A' AND d='E') OR
+      (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D'))
+  } {A B C D E}
+}
 
 do_execsql_test 305 {
   SELECT * FROM t1, t2 WHERE
@@ -182,10 +184,12 @@ do_execsql_test 306 {
     (a='A' AND d='E')
 } {A B C D E}
 
-do_execsql_test 307 {
-  SELECT * FROM t1, t2 WHERE
-    (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D')) OR
-    (a='A' AND d='E')
-} {A B C D E}
+ifcapable compound {
+  do_execsql_test 307 {
+    SELECT * FROM t1, t2 WHERE
+      (b='B' AND c IN (SELECT 'B' UNION SELECT 'C' UNION SELECT 'D')) OR
+      (a='A' AND d='E')
+  } {A B C D E}
+}
 
 finish_test

diff --git a/test/tkt-b72787b1.test b/test/tkt-b72787b1.test
index 11ea41ed7aa69c029c84adacff421973bf494363..dea3f49a6409d2678111bfe9282aac3b36430044 100644 (file)
--- a/test/tkt-b72787b1.test
+++ b/test/tkt-b72787b1.test
@@ -35,6 +35,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 unset -nocomplain ::STMT
 proc runsql {} {
   db eval {CREATE TABLE IF NOT EXISTS t4(q)}

diff --git a/test/tkt-d82e3f3721.test b/test/tkt-d82e3f3721.test
index 31f7d342c7d667beae21249e39b8373e48a5825b..da932d1eaa8a5c66ed6f910c46bcbf8c3b9d9891 100644 (file)
--- a/test/tkt-d82e3f3721.test
+++ b/test/tkt-d82e3f3721.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt-d82e3-1.1 {
   db eval {
     CREATE TABLE t1(a INTEGER PRIMARY KEY AUTOINCREMENT, b);

diff --git a/test/tkt-f777251dc7a.test b/test/tkt-f777251dc7a.test
index 6f0b43fa8e6bbdccf1e82fb31948918492cadd27..25bf667d7d90b7f2c81f6957b74de58e8d71942d 100644 (file)
--- a/test/tkt-f777251dc7a.test
+++ b/test/tkt-f777251dc7a.test
@@ -17,6 +17,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt-f7772-1.1 {
   execsql {
      CREATE TEMP TABLE t1(x UNIQUE);

diff --git a/test/tkt3527.test b/test/tkt3527.test
index 34e9e6121f3501bba1fe6111ba9df1d1c030520a..d9b1dadfdcf2d089bcb8f9a9de1be365dc4a6e6a 100644 (file)
--- a/test/tkt3527.test
+++ b/test/tkt3527.test
@@ -18,6 +18,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt3527-1.1 {
   db eval {
     CREATE TABLE Element (

diff --git a/test/tkt3773.test b/test/tkt3773.test
index 0dc414e50e8b59b2388e52d75207146e09c13e00..3f5a1a3217ae4ede2647bdfef161aa0d81b69fa9 100644 (file)
--- a/test/tkt3773.test
+++ b/test/tkt3773.test
@@ -18,6 +18,11 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
+ifcapable !compound {
+  finish_test
+  return
+}
+
 do_test tkt3773-1.1 {
   db eval {
     CREATE TABLE t1(a,b);

diff --git a/test/trigger1.test b/test/trigger1.test
index 1e77fe0fc84d486720b45e8c4a02bf5f6f787c12..9d917bdb3897f1b1d327eafacfc407d60f9ff73d 100644 (file)
--- a/test/trigger1.test
+++ b/test/trigger1.test
@@ -29,7 +29,7 @@
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-ifcapable {!trigger} {
+ifcapable !trigger||!compound {
   finish_test
   return
 }

diff --git a/test/vtabD.test b/test/vtabD.test
index 509ba457458ef8b2d039335d3171c8e6595dd21e..589f518983d0b0abdf945175fb1067eecf486b3a 100644 (file)
--- a/test/vtabD.test
+++ b/test/vtabD.test
@@ -49,17 +49,15 @@ do_test vtabD-1.5 {
 do_test vtabD-1.6 {
   execsql { SELECT * FROM tv1 WHERE a < 500 OR b = 810000 }
 } [execsql {
-  SELECT * FROM t1 WHERE a < 500
-    UNION ALL
-  SELECT * FROM t1 WHERE b = 810000 AND NOT (a < 500)
+  SELECT * FROM t1 WHERE a < 500;
+  SELECT * FROM t1 WHERE b = 810000 AND NOT (a < 500);
 }]
 
 do_test vtabD-1.7 {
   execsql { SELECT * FROM tv1 WHERE a < 90000 OR b = 8100000000 }
 } [execsql {
-  SELECT * FROM t1 WHERE a < 90000
-    UNION ALL
-  SELECT * FROM t1 WHERE b = 8100000000 AND NOT (a < 90000)
+  SELECT * FROM t1 WHERE a < 90000;
+  SELECT * FROM t1 WHERE b = 8100000000 AND NOT (a < 90000);
 }]
 
 if {[working_64bit_int]} {

diff --git a/test/vtab_shared.test b/test/vtab_shared.test
index ce2e432fcfa23d858f8e81e0c95473bd566cbdd2..6a76e2749b014c57cedd4e36da2b85a635854c4b 100644 (file)
--- a/test/vtab_shared.test
+++ b/test/vtab_shared.test
@@ -124,23 +124,25 @@ breakpoint
   execsql { SELECT * FROM t3 } db2
 } {1 2 3 4 5 6}
 
-do_test vtab_shared-1.12.1 {
-  db close
-  execsql { 
-    SELECT * FROM t1 UNION ALL
-    SELECT * FROM t2 UNION ALL
-    SELECT * FROM t3 
-  } db2
-} {1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6}
-do_test vtab_shared-1.12.2 {
-  sqlite3 db test.db
-  register_echo_module [sqlite3_connection_pointer db]
-  execsql { 
-    SELECT * FROM t1 UNION ALL
-    SELECT * FROM t2 UNION ALL
-    SELECT * FROM t3 
-  } db
-} {1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6}
+ifcapable compound {
+  do_test vtab_shared-1.12.1 {
+    db close
+    execsql { 
+      SELECT * FROM t1 UNION ALL
+      SELECT * FROM t2 UNION ALL
+      SELECT * FROM t3 
+    } db2
+  } {1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6}
+  do_test vtab_shared-1.12.2 {
+    sqlite3 db test.db
+    register_echo_module [sqlite3_connection_pointer db]
+    execsql { 
+      SELECT * FROM t1 UNION ALL
+      SELECT * FROM t2 UNION ALL
+      SELECT * FROM t3 
+    } db
+  } {1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 4 5 6}
+}
 
 # Try a rename or two.
 #

diff --git a/test/where9.test b/test/where9.test
index b4a2d8d130ebf828f336f7bc2d405149309f677f..8c5c96e2a8e8b9a9e2dec10c6b099d3ea8b2a830 100644 (file)
--- a/test/where9.test
+++ b/test/where9.test
@@ -15,7 +15,7 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 
-ifcapable !or_opt {
+ifcapable !or_opt||!compound {
   finish_test
   return
 }