Mercurial > hg > openjdk > jdk9 > nashorn
changeset 1822:541ccdb8cf5f
8168037: Use ZIPEXE instead of ZIP to avoid clash with options for zip
Reviewed-by: erikj
author | ihse |
---|---|
date | Tue, 22 Nov 2016 14:48:16 +0100 |
parents | f63350d26821 |
children | 9e86d6383456 |
files | test/Makefile |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/Makefile Fri Nov 18 15:26:24 2016 +0100 +++ b/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_) @@ -149,7 +149,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")