Omit the single test from zipfile.test that uses json functionality in

non-SQLITE_ENABLE_JSON1 builds.

FossilOrigin-Name: 6bb2a10fad71bf8cec6bca538db7b00be0d26418ab62b83092d3a6a68d1c0d9f

diff --git a/manifest b/manifest
index 65dfc625fb69fc987452bdf4649e03a8cac53947..d7a28944989d23d87d4e14c000d505327c0803c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\stest\sfile\sfts5fault6.test\sto\saccount\sfor\stest\stokenizers\simplemented\sin\nTcl\sreturning\sSQLITE_ERROR\sinstead\sof\sSQLITE_NOMEM\sfollowing\san\sOOM\serror.
-D 2018-01-17T12:57:07.649
+C Omit\sthe\ssingle\stest\sfrom\szipfile.test\sthat\suses\sjson\sfunctionality\sin\nnon-SQLITE_ENABLE_JSON1\sbuilds.
+D 2018-01-17T12:58:11.883
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2
@@ -1600,7 +1600,7 @@ F test/wordcount.c cb589cec469a1d90add05b1f8cee75c7210338d87a5afd65260ed5c0f4bbf
 F test/writecrash.test f1da7f7adfe8d7f09ea79b42e5ca6dcc41102f27f8e334ad71539501ddd910cc
 F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
 F test/zerodamage.test 9c41628db7e8d9e8a0181e59ea5f189df311a9f6ce99cc376dc461f66db6f8dc
-F test/zipfile.test 17e3ed850c7f182a5ce746fadc1a0497495aeacba216d73ece7b3b2c5dfd8867
+F test/zipfile.test cb42e8fa6ba5db4a03ce6baa4401fc6236baf6eb5e62b44f3e463bf6aafd631d
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
 F tool/GetTclKit.bat 8995df40c4209808b31f24de0b58f90930239a234f7591e3675d45bfbb990c5d
 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
@@ -1699,7 +1699,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 3e04999dabb87715de46255b1a9b08d5dfa70d140e0a09a37ea2842d71c77caf
-R 941f33fbf2a23d6c019574c3e00d86d4
+P c232f6424a858ede44940a927fe4e26ee99c6ab614aa6f63e13ba46e88dbb280
+R 1693bc0c1e569048e8eec005916d4449
 U dan
-Z f10d4208193a5de16aeae87ee4be55df
+Z 8dee77e444940dc97285c3ee0298e6bb

diff --git a/manifest.uuid b/manifest.uuid
index 9d255d110ea25fcb5e11a844adf043479473b8c5..ac4e92148905f467db77f49a50a816414069e463 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c232f6424a858ede44940a927fe4e26ee99c6ab614aa6f63e13ba46e88dbb280
\ No newline at end of file
+6bb2a10fad71bf8cec6bca538db7b00be0d26418ab62b83092d3a6a68d1c0d9f
\ No newline at end of file

diff --git a/test/zipfile.test b/test/zipfile.test
index c324e0d7c7c2ff771cee1db5284e03c455ba3197..07fc80f60283e19393a5da00d97239eb05d95e7f 100644 (file)
--- a/test/zipfile.test
+++ b/test/zipfile.test
@@ -75,13 +75,15 @@ do_execsql_test 1.4 {
   h.txt 1000000004 aaaaaaaaaabbbbbbbbbb 8
 }
 
-do_execsql_test 1.4.1 {
-  SELECT name, json_extract( zipfile_cds(z) , '$.crc32')!=0
-  FROM zipfile('test.zip');
-} {
-  f.txt 1
-  g.txt 1
-  h.txt 1
+ifcapable json1 {
+  do_execsql_test 1.4.1 {
+    SELECT name, json_extract( zipfile_cds(z) , '$.crc32')!=0
+    FROM zipfile('test.zip');
+  } {
+    f.txt 1
+    g.txt 1
+    h.txt 1
+  }
 }
 
 do_execsql_test 1.5.1 {