Another change to test file zipfile.test to help it run on systems without "unzip".

FossilOrigin-Name: b6252feb125db16dabf6ce07568159f0002f9053df1b7b600e2614cc9da24873

diff --git a/manifest b/manifest
index 46676f4907603549e3613142cf5beb35c48961d4..50106f9a0309a35570a8239df78be18899b99c3f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\stest\sscript\sbug\scausing\szipfile.test\sto\sfail\son\ssystems\sthat\sdo\snot\shave\nthe\s"unzip"\sprogram\sinstalled.
-D 2018-03-29T16:39:09.399
+C Another\schange\sto\stest\sfile\szipfile.test\sto\shelp\sit\srun\son\ssystems\swithout\s"unzip".
+D 2018-03-29T23:54:00.503
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -1616,7 +1616,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 1eb76362ed2fe75f3c4c2b912a7330238d24264be61f15dc640ec07e84d11df0
+F test/zipfile.test a61f6ba6dbaaf4983849df84a31df140c7ddd1362e2fa9ecd3cdf5cd123b7f18
 F test/zipfile2.test fc2f08d5ec19c18c83289fbed32e378dc5116519972166e57a244da7bf2e5805
 F test/zipfilefault.test 44d4d7a7f7cca7521d569d7f71026b241d65a6b1757aa409c1a168827edbbc2c
 F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
@@ -1717,7 +1717,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 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda
-R dce09e886df57f811f3b3ebfeb840273
+P d99022a5a8e4469a87a9fab8a976271e5785524da73ac1d2fae47d00d90fc07a
+R 9f04f7bc3b45025e3c2d4d58ad190fe8
 U dan
-Z f0c5601ad626f20cd4729aaf285d8dd8
+Z cab730845b87199b1c3155e779670aea

diff --git a/manifest.uuid b/manifest.uuid
index a4627c14810022441a799bb110f07a80d8b3aa79..0f933d3b28c9f8a9668e26a3f3dd647179a3f99c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d99022a5a8e4469a87a9fab8a976271e5785524da73ac1d2fae47d00d90fc07a
\ No newline at end of file
+b6252feb125db16dabf6ce07568159f0002f9053df1b7b600e2614cc9da24873
\ No newline at end of file

diff --git a/test/zipfile.test b/test/zipfile.test
index 49b3682b1b95b2a9153c70c87fb17c9034f4ca0c..ebc497786f33f8bfea8a7d70b47f373700e0099f 100644 (file)
--- a/test/zipfile.test
+++ b/test/zipfile.test
@@ -647,6 +647,8 @@ do_test 8.0.3 {
 } {}
 execsql COMMIT
 
+catch { forcedelete test_unzip }
+catch { file mkdir test_unzip }
 do_execsql_test 8.1.1 {
   CREATE VIRTUAL TABLE nogood USING zipfile('test_unzip');
 }