commit 4ee4561f2153f3b0bc3be2e781488a97c73ca58e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 30 01:26:09 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 30 01:26:09 2019 +0000
tree 8f9cc651764686140accaadcfb8f77bf7572c24b
parent d0a6d8c797d15d459d0804c0f68a66f2d36b41ef
parent b1cb47d2d6f54fa279b5b626f8f7fa705c946cb9

Merge "Run unzip with -o -f for zipapex tests"

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 50d5fee..7453823 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -761,8 +761,8 @@
   if [ "$DEV_MODE" = "y" ]; then
     zip_options=""
   fi
-  setupapex_cmdline="unzip -u ${zip_options} ${ZIPAPEX_LOC} apex_payload.zip -d ${DEX_LOCATION}"
-  installapex_cmdline="unzip -u ${zip_options} ${DEX_LOCATION}/apex_payload.zip -d ${DEX_LOCATION}/zipapex"
+  setupapex_cmdline="unzip -o -f -u ${zip_options} ${ZIPAPEX_LOC} apex_payload.zip -d ${DEX_LOCATION}"
+  installapex_cmdline="unzip -o -f -u ${zip_options} ${DEX_LOCATION}/apex_payload.zip -d ${DEX_LOCATION}/zipapex"
   BIN_DIR=$DEX_LOCATION/zipapex/bin
 fi