# HG changeset patch
# User ihse
# Date 1479822496 -3600
# Node ID 6965d53e507c965a5f5b65976099f1c22c967f60
# Parent  6b4cdd4a4609b4e6205e6f71fe9950320d34d3bb
8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
Reviewed-by: erikj

diff -r 6b4cdd4a4609 -r 6965d53e507c jdk/test/Makefile
--- a/jdk/test/Makefile	Tue Nov 22 01:37:18 2016 -0800
+++ b/jdk/test/Makefile	Tue Nov 22 14:48:16 2016 +0100
@@ -55,7 +55,7 @@
 UNAME     = uname
 UNIQ      = uniq
 WC        = wc
-ZIP       = zip
+ZIPEXE    = zip
 
 # Get OS name from uname (Cygwin inexplicably adds _NT-5.1)
 UNAME_S := $(shell $(UNAME) -s | $(CUT) -f1 -d_)
@@ -162,7 +162,7 @@
 ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`     \
 	           && $(CD) $(ABS_TEST_OUTPUT_DIR)             \
 	           && $(CHMOD) -R a+r . \
-	           && $(ZIP) -q -r $(ARCHIVE_BUNDLE) . )
+	           && $(ZIPEXE) -q -r $(ARCHIVE_BUNDLE) . )
 
 # important results files
 SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")