changeset 1681:257534f191e8

8139969: Fix unzip in compare.sh broken by JDK-8136813 Reviewed-by: erikj
author ihse
date Tue, 20 Oct 2015 16:40:01 +0200
parents 24a3936909e3
children cb3f10185e63 a44eac54cdc3
files common/autoconf/compare.sh.in common/bin/compare.sh
diffstat 2 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/compare.sh.in	Tue Oct 20 10:39:07 2015 +0200
+++ b/common/autoconf/compare.sh.in	Tue Oct 20 16:40:01 2015 +0200
@@ -66,7 +66,7 @@
 export TEE="@TEE@"
 export UNIQ="@UNIQ@"
 export UNPACK200="@FIXPATH@ @BOOT_JDK@/bin/unpack200"
-export UNZIP="@UNZIP@"
+export UNARCHIVE="@UNZIP@ -q"
 
 export SRC_ROOT="@TOPDIR@"
 export OUTPUT_ROOT="@OUTPUT_ROOT@"
--- a/common/bin/compare.sh	Tue Oct 20 10:39:07 2015 +0200
+++ b/common/bin/compare.sh	Tue Oct 20 16:40:01 2015 +0200
@@ -51,8 +51,6 @@
     STAT_PRINT_SIZE="-c %s"
 fi
 
-UNARCHIVE="$UNZIP -q"
-
 COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
 if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
     echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"