From 1f035a5b937ff79926b5d6e643c6b7e3c4823c1a Mon Sep 17 00:00:00 2001
From: Magnus Ihse Bursie <ihse@openjdk.org>
Date: Tue, 22 Nov 2016 14:48:16 +0100
Subject: [PATCH] 8168037: Use ZIPEXE instead of ZIP to avoid clash with
 options for zip

Reviewed-by: erikj
---
 nashorn/test/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nashorn/test/Makefile b/nashorn/test/Makefile
index 6d6eb008577..d4fec83ae78 100644
--- a/nashorn/test/Makefile
+++ b/nashorn/test/Makefile
@@ -55,7 +55,7 @@ TEE       = tee
 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_)
@@ -149,7 +149,7 @@ endif
 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")