Fix a test script bug causing zipfile.test to fail on systems that do not have

the "unzip" program installed.

FossilOrigin-Name: d99022a5a8e4469a87a9fab8a976271e5785524da73ac1d2fae47d00d90fc07a

diff --git a/manifest b/manifest
index a093bd39deedfec53551a224843cf2d4ad4b0c72..46676f4907603549e3613142cf5beb35c48961d4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Modify\sthe\ssqlite3OsFileControl()\sinterface\sto\sdetect\sunopened\ssqlite3_file\nobjects\sand\sreturn\sSQLITE_NOTFOUND.
-D 2018-03-29T13:47:01.178
+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
 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 2a923f6ead6a0f9b61d936881f3ee2aeaabe15fc65c196456f58ea9b4b450f9b
+F test/zipfile.test 1eb76362ed2fe75f3c4c2b912a7330238d24264be61f15dc640ec07e84d11df0
 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 d67f1c7d18d076b18e327ae4e3bccf6086b8f3fd370a7550d77753fc1f1ce07f
-R 4559ba7bbf0c32276342155c250ecd82
-U drh
-Z 02f35d500ecf3e4928c8a131db60d443
+P 1fc72b707d4f4df049c19b023ae3f70cb45d6a6768bb68efc519cfdcd2d2ecda
+R dce09e886df57f811f3b3ebfeb840273
+U dan
+Z f0c5601ad626f20cd4729aaf285d8dd8

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

diff --git a/test/zipfile.test b/test/zipfile.test
index 71f4aa9c74b2d1983300928cda3871804b58f2e7..49b3682b1b95b2a9153c70c87fb17c9034f4ca0c 100644 (file)
--- a/test/zipfile.test
+++ b/test/zipfile.test
@@ -158,7 +158,9 @@ proc strip_slash {in} { regsub {/$} $in {} }
 
 proc do_zip_tests {tn file} {
   uplevel do_zipfile_blob_test $tn.1 $file
-  uplevel do_unzip_test $tn.2 $file
+  if {[info exists ::UNZIP]} {
+    uplevel do_unzip_test $tn.2 $file
+  }
 }
 
 forcedelete test.zip