From: dan Date: Mon, 22 Nov 2021 16:48:42 +0000 (+0000) Subject: Omit wal mode tests in vacuum-into.test for builds and configurations that do not... X-Git-Tag: version-3.37.0~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b127d0fd2a09e3f3fbb3ec4300afec70e7680c4c;p=thirdparty%2Fsqlite.git Omit wal mode tests in vacuum-into.test for builds and configurations that do not support wal mode. FossilOrigin-Name: 65de17635468791678b9d205552a4faec2d6c3b7d330c559b6f81ab072254533 --- diff --git a/manifest b/manifest index 1360f8328e..d050f5deb7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\sattempt\sto\srun\sthe\stests\sin\salterfault.est\swith\sSQLITE_OMIT_ALTERTABLE\sbuilds. -D 2021-11-22T16:43:53.566 +C Omit\swal\smode\stests\sin\svacuum-into.test\sfor\sbuilds\sand\sconfigurations\sthat\sdo\snot\ssupport\swal\smode. +D 2021-11-22T16:48:42.627 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -1684,7 +1684,7 @@ F test/uri.test 3481026f00ade6dfe8adb7acb6e1e47b04369568 F test/uri2.test 9d3ba7a53ee167572d53a298ee4a5d38ec4a8fb7 F test/userauth01.test e740a2697a7b40d7c5003a7d7edaee16acd349a9 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae -F test/vacuum-into.test c4c25dcf8ca909e33c1f5f0bb0f54b990c2c1dcbee7a4995843e79e40681a894 +F test/vacuum-into.test f0b8c091df5305728b6973e9cce4166c861955b650dd3c599cb045d7160d3971 F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d F test/vacuum2.test 9fd45ce6ce29f5614c249e03938d3567c06a9e772d4f155949f8eafe2d8af520 F test/vacuum3.test d9d9a04ee58c485b94694fd4f68cffaba49c32234fdefe1ac1a622c5e17d4ce3 @@ -1933,7 +1933,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 eff4187c50790827d05bb28867cc6546196e7eee3b4c4de54b4e68bfb4e2830e -R e74dcf7ef50c628282eca9908e567209 +P 6f6f31c7df6831af28a24e69f744beeade739bb7bbb0810d5bbe592e4cd75e3d +R b2cc8f3ef268f34c97829cb1aa58b60b U dan -Z e9c3150a5b28eb3f3c86b6afe4501e3e +Z 7717fd30c8d7147f1267bc468c6e03ee diff --git a/manifest.uuid b/manifest.uuid index 063798902d..2f57ee599f 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -6f6f31c7df6831af28a24e69f744beeade739bb7bbb0810d5bbe592e4cd75e3d \ No newline at end of file +65de17635468791678b9d205552a4faec2d6c3b7d330c559b6f81ab072254533 \ No newline at end of file diff --git a/test/vacuum-into.test b/test/vacuum-into.test index 1207105e05..a46d95cf17 100644 --- a/test/vacuum-into.test +++ b/test/vacuum-into.test @@ -103,32 +103,34 @@ db close # Change the page-size on a VACUUM INTO even if the original # database is in WAL mode. # -forcedelete test.db -forcedelete test.db2 -do_test vacuum-into-600 { - sqlite3 db test.db - db eval { - PRAGMA page_size=4096; - PRAGMA journal_mode=WAL; - CREATE TABLE t1(a); - INSERT INTO t1 VALUES(19); - CREATE INDEX t1a ON t1(a); - PRAGMA integrity_check; - } -} {wal ok} -do_execsql_test vacuum-into-610 { - PRAGMA page_size; -} {4096} -do_execsql_test vacuum-into-620 { - PRAGMA page_size=1024; - VACUUM INTO 'test.db2'; -} {} -do_test vacuum-into-630 { - sqlite3 db test.db2 - db eval { +if {[wal_is_capable]} { + forcedelete test.db + forcedelete test.db2 + do_test vacuum-into-600 { + sqlite3 db test.db + db eval { + PRAGMA page_size=4096; + PRAGMA journal_mode=WAL; + CREATE TABLE t1(a); + INSERT INTO t1 VALUES(19); + CREATE INDEX t1a ON t1(a); + PRAGMA integrity_check; + } + } {wal ok} + do_execsql_test vacuum-into-610 { PRAGMA page_size; - PRAGMA integrity_check; - } -} {1024 ok} + } {4096} + do_execsql_test vacuum-into-620 { + PRAGMA page_size=1024; + VACUUM INTO 'test.db2'; + } {} + do_test vacuum-into-630 { + sqlite3 db test.db2 + db eval { + PRAGMA page_size; + PRAGMA integrity_check; + } + } {1024 ok} +} finish_test