stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8189664: Stop producing ARCHIVE_BUNDLE.zip from test makefiles unless asked to

Browse Source 
Reviewed-by: ihse
This commit is contained in:
Erik Joelsson 2017-10-23 10:41:34 +02:00
parent 37644f5c79
commit c7084efdb5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/TestCommon.gmk
View File

@ -176,16 +176,17 @@ endif
# Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results) # Expect JPRT to set JPRT_ARCHIVE_BUNDLE (path to zip bundle for results)
ifdef JPRT_ARCHIVE_BUNDLE ifdef JPRT_ARCHIVE_BUNDLE
ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE) ARCHIVE_BUNDLE = $(JPRT_ARCHIVE_BUNDLE)
else
ARCHIVE_BUNDLE = $(ABS_TEST_OUTPUT_DIR)/ARCHIVE_BUNDLE.zip
endif endif
# How to create the test bundle (pass or fail, we want to create this) # How to create the test bundle (pass or fail, we want to create this)
# Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed. # Follow command with ";$(BUNDLE_UP_AND_EXIT)", so it always gets executed.
ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \ ifneq ($(ARCHIVE_BUNDLE), )
ZIP_UP_RESULTS = ( $(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` \
&& $(CD) $(ABS_TEST_OUTPUT_DIR) \ && $(CD) $(ABS_TEST_OUTPUT_DIR) \
&& $(CHMOD) -R a+r . \ && $(CHMOD) -R a+r . \
&& $(ZIPEXE) -q -r $(ARCHIVE_BUNDLE) . ) && $(ZIPEXE) -q -r $(ARCHIVE_BUNDLE) . ) ;
CLEAN_ARCHIVE_BUNDLE = @$(RM) $(ARCHIVE_BUNDLE)
endif
# important results files # important results files
SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt") SUMMARY_TXT = $(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)/JTreport/text/summary.txt")
@ -252,7 +253,7 @@ BUNDLE_UP_AND_EXIT = \
if [ -f $(STATS_TXT) ] ; then \ if [ -f $(STATS_TXT) ] ; then \
$(CAT) $(STATS_TXT); \ $(CAT) $(STATS_TXT); \
fi; \ fi; \
$(ZIP_UP_RESULTS) ; \ $(ZIP_UP_RESULTS) \
$(TESTEXIT) \ $(TESTEXIT) \
) )
@ -272,7 +273,6 @@ BUNDLE_UP_AND_EXIT = \
# service, you may need CYGWIN=ntsec for this to work. # service, you may need CYGWIN=ntsec for this to work.
prep: prep:
@$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR)
@$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)`
@if [ ! -d $(TEST_ROOT)/../../.hg ] && [ ! -d $(TEST_ROOT)/../../../.hg ]; then \ @if [ ! -d $(TEST_ROOT)/../../.hg ] && [ ! -d $(TEST_ROOT)/../../../.hg ]; then \
$(FIND) $(TEST_ROOT) \( -name \*.dll -o -name \*.DLL -o -name \*.so \) \ $(FIND) $(TEST_ROOT) \( -name \*.dll -o -name \*.DLL -o -name \*.so \) \
-exec $(CHMOD) a+rx {} \; ; \ -exec $(CHMOD) a+rx {} \; ; \
@ -286,7 +286,7 @@ endif
# Cleanup # Cleanup
clean: clean:
@$(RM) -r $(ABS_TEST_OUTPUT_DIR) @$(RM) -r $(ABS_TEST_OUTPUT_DIR)
@$(RM) $(ARCHIVE_BUNDLE) $(CLEAN_ARCHIVE_BUNDLE)
################################################################ ################################################################