From 9430e43da34ca2c7bc124eef1253f0f00f7ce1e5 Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 20 Oct 2015 16:40:01 +0200
Subject: [PATCH] 8139969: Fix unzip in compare.sh broken by JDK-8136813
Reviewed-by: erikj
---
common/autoconf/compare.sh.in | 2 +-
common/bin/compare.sh | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/autoconf/compare.sh.in b/common/autoconf/compare.sh.in
index 3e426776535..b7bf2b4cecb 100644
--- a/common/autoconf/compare.sh.in
+++ b/common/autoconf/compare.sh.in
@@ -66,7 +66,7 @@ export STRIP="@STRIP@ @STRIPFLAGS@"
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@"
diff --git a/common/bin/compare.sh b/common/bin/compare.sh
index 77d51c41df0..7952b2b6abb 100644
--- a/common/bin/compare.sh
+++ b/common/bin/compare.sh
@@ -51,8 +51,6 @@ else
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"