From: dan Date: Tue, 11 Aug 2020 14:01:32 +0000 (+0000) Subject: Do not run tests in concreport.test for non SQLITE_ENABLE_PREUPDATE_HOOK builds. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1c7d4a6d034c0dc1db65be62d463b10187f64cb;p=thirdparty%2Fsqlite.git Do not run tests in concreport.test for non SQLITE_ENABLE_PREUPDATE_HOOK builds. FossilOrigin-Name: e39e7a6fc793912ab26e5ffc746b38941ec69a7edc100a6034d3ffb1edb606a7 --- diff --git a/manifest b/manifest index d41c4c06b4..cbba52ee68 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Merge\sbegin-concurrent-pnu\schanges\sinto\sthis\sbranch. -D 2020-07-30T19:56:53.449 +C Do\snot\srun\stests\sin\sconcreport.test\sfor\snon\sSQLITE_ENABLE_PREUPDATE_HOOK\sbuilds. +D 2020-08-11T14:01:32.006 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -767,7 +767,7 @@ F test/collateB.test 1e68906951b846570f29f20102ed91d29e634854ee47454d725f2151eca F test/colmeta.test 2c765ea61ee37bc43bbe6d6047f89004e6508eb1 F test/colname.test 87ad5458bb8709312dac0d6755fd30e8e4ca83298d0a9ef6e5c24277a3c3390e F test/concfault.test af01b1f6cca45b8f17bb13b4406ec43ab1689181a08850b990596c7a9f4e656f -F test/concreport.test 8192db6f7dce580231ea5a0d60c471598c7902bcac719b8be2d221060ff1c29f +F test/concreport.test 08b32b6e042ded033a822d086a22b7acfdf118c23fd0c124fee685723175a942 F test/concurrent.test a0248ec6e3e79a5948453649cf86b5b359175cba55ea636b15426d6f0fa6c3da F test/concurrent2.test de748c7dd749c77e2af2c4b914b9b09a28ac09608042ca498c0251dc6f46aa1a F test/concurrent3.test 530671ac706f6a1d0f4992dbdd33a86408330d03cd90fb9e82ecb1b27f5fd081 @@ -1896,7 +1896,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 12a909fb3d80fcf84646644f2904be9827c643d0a98257448777c83b4f1dc90c 2b3241cf67c8eea761760ac27df7a136bcca2dca10c152a36b216c5dc88cdb53 -R b1555df6424edb3b68be83ea7b456123 +P fd01e78827f22f8453ed11e5b0ec736302cc45465e5105241568eb6686ced882 +R 302982d2fde0c9b3e073446cbe8d9d6e U dan -Z 94dfedad60e693661825ed6ec7be94b2 +Z 8f726b7a969e629dac7ebdb154c6c3b9 diff --git a/manifest.uuid b/manifest.uuid index ad27fb1578..1756e6c496 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fd01e78827f22f8453ed11e5b0ec736302cc45465e5105241568eb6686ced882 \ No newline at end of file +e39e7a6fc793912ab26e5ffc746b38941ec69a7edc100a6034d3ffb1edb606a7 \ No newline at end of file diff --git a/test/concreport.test b/test/concreport.test index d9413e170e..12d6812a91 100644 --- a/test/concreport.test +++ b/test/concreport.test @@ -15,7 +15,7 @@ source $testdir/tester.tcl source $testdir/lock_common.tcl set ::testprefix concreport -ifcapable !concurrent { +ifcapable !concurrent||!preupdate { finish_test return }