From: dan <dan@noemail.net>
Date: Fri, 23 Feb 2018 13:58:17 +0000 (+0000)
Subject: Avoid running a test case that requires zstd in non-SQLITE_HAVE_ZSTD builds.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=241676abcc937b9869081506fcc38f2884f0856f;p=thirdparty%2Fsqlite.git

Avoid running a test case that requires zstd in non-SQLITE_HAVE_ZSTD builds.

FossilOrigin-Name: d716dff4441b4d28e0184ce06508bc9122451103ead8edbfbf3c87b666445ee6
---

diff --git a/ext/zonefile/zonefilefault.test b/ext/zonefile/zonefilefault.test
index 628b052f0e..0566c0b7ba 100644
--- a/ext/zonefile/zonefilefault.test
+++ b/ext/zonefile/zonefilefault.test
@@ -41,17 +41,25 @@ do_faultsim_test 1.1 -faults oom* -prep {
   faultsim_test_result {0 {{}}}
 }
 
-do_faultsim_test 1.2 -faults oom* -prep {
-  sqlite3 db test.db
-  load_static_extension db zonefile
-} -body {
-  execsql {
+set sql {
     SELECT zonefile_write('test.zonefile', 'tt',
         '{"compressionTypeContent":"zstd_global_dict"}'
     );
+}
+
+if {[catch { db eval $sql }]==0} {
+  do_faultsim_test 1.2 -faults oom* -prep {
+    sqlite3 db test.db
+    load_static_extension db zonefile
+  } -body {
+    execsql {
+      SELECT zonefile_write('test.zonefile', 'tt',
+          '{"compressionTypeContent":"zstd_global_dict"}'
+      );
+    }
+  } -test {
+    faultsim_test_result {0 {{}}}
   }
-} -test {
-  faultsim_test_result {0 {{}}}
 }
 
 do_execsql_test 2.0 {
diff --git a/manifest b/manifest
index 50c19fd156..acf5dd66a8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2018-02-23T13:45:05.056
+C Avoid\srunning\sa\stest\scase\sthat\srequires\szstd\sin\snon-SQLITE_HAVE_ZSTD\sbuilds.
+D 2018-02-23T13:58:17.194
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in a2d2fb8d17c39ab5ec52beb27850b903949080848236923f436156b72a958737
@@ -412,7 +412,7 @@ F ext/zonefile/README.md df86ef5b4f9aa8b07e1c8124b3f2dcea616927385aad59d525b784f
 F ext/zonefile/zonefile.c f43dd41bd121ce8ab4f46ba3c8136e674df88ec2eb7ccc1c974e8e8b5aaa6e99
 F ext/zonefile/zonefile1.test d80e8fd9db0b4b942628d00136ee448ce5b1b5e09f4b85a25aef500b888d62e9
 F ext/zonefile/zonefileenc.test f23e16fc8810c95588dfd528af8e4332f0d1d13370fdd7163226ec886715058e
-F ext/zonefile/zonefilefault.test 5a76456541a7779d4869e0803dbc2d5453f941080a68ed1e3f3d1783d79548f6
+F ext/zonefile/zonefilefault.test 7f93ba8420d6f6a461d2fbbce30a04f744764f584c0c17361a867db8088f5595
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
@@ -1712,7 +1712,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 f4d42162fa2196078cea4db9c2247a08f5439d29e49f5e8dc23db317b8101865 15c587cf6ffc920dc37f67cacb4f0db6a603fb998a22a639f755387910516414
-R c9eb5aa421f123c9e5cf280b61bfc247
-U mistachkin
-Z 77c6473b56216379f2a9d96a44a69e0a
+P 53f2100a296f64d206f1caf2d754820a7898bb33b31a6ab2169957d228d5d2a0
+R 0e212e0e9239ba8677898e0760493590
+U dan
+Z c33750ba5a66f2c197371c0a690fad0a
diff --git a/manifest.uuid b/manifest.uuid
index bc53b8d6cd..ed273df3ea 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53f2100a296f64d206f1caf2d754820a7898bb33b31a6ab2169957d228d5d2a0
\ No newline at end of file
+d716dff4441b4d28e0184ce06508bc9122451103ead8edbfbf3c87b666445ee6
\ No newline at end of file