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

8023491: Remove target names from test/Makefile and defer to sub-repo makefiles

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mike Duigou 2013-08-26 10:09:15 -07:00
parent b2e2be3046
commit f903091ee2
2 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/makefiles/Main.gmk
View File

@ -183,7 +183,7 @@ bootcycle-images-only: start-make
test: images test-only test: images test-only
test-only: start-make test-only: start-make
@$(call TargetEnter) @$(call TargetEnter)
@($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) JPRT_JAVA_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true @($(CD) $(SRC_ROOT)/test && $(BUILD_LOG_WRAPPER) $(MAKE) -j1 -k MAKEFLAGS= JT_HOME=$(JT_HOME) PRODUCT_HOME=$(JDK_IMAGE_DIR) ALT_OUTPUTDIR=$(OUTPUT_ROOT) CONCURRENCY=$(JOBS) $(TEST)) || true
@$(call TargetExit) @$(call TargetExit)
# Stores the tips for each repository. This file is be used when constructing the jdk image and can be # Stores the tips for each repository. This file is be used when constructing the jdk image and can be

53
test/Makefile
View File

@ -49,61 +49,22 @@ else \
fi fi
endef endef
# Test target list for langtools repository
LANGTOOLS_TEST_LIST = langtools_jtreg
# Test target list for jdk repository
JDK_ALL_TEST_LIST = \
jdk_beans1 \
jdk_io \
jdk_lang \
jdk_math \
jdk_other \
jdk_net \
jdk_nio \
jdk_security1 \
jdk_text \
jdk_util \
jdk_time \
jdk_awt \
jdk_beans2 jdk_beans3 \
jdk_management \
jdk_jmx \
jdk_security2 jdk_security3 \
jdk_rmi \
jdk_sound \
jdk_swing \
jdk_tools \
jdk_jdi \
jdk_jfr
# Theses are meta test targets in jdk
JDK_META_TEST_LIST = jdk_all jdk_default jdk_core
# These are the current jck test targets in the jdk repository
JDK_JCK7_LIST = jck7devtools jck7compiler jck7runtime
# Default test target (core) # Default test target (core)
default: jdk_core $(LANGTOOLS_TEST_LIST) default: jdk_core langtools_jtreg
# All testing # All testing
all: $(JDK_ALL_TEST_LIST) $(LANGTOOLS_TEST_LIST) all: jdk_all langtools_all
# Test targets # Test targets
$(LANGTOOLS_TEST_LIST): langtools_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) @$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_OUTPUT_DIR=$(ALT_OUTPUTDIR)/testoutput/langtools/jtreg JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST): jdk_% :
@$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), $@) @$(NO_STOPPING)$(call SUBDIR_TEST, $(JDK_DIR), TEST="$@" $@)
clean:
################################################################ ################################################################
# Phony targets (e.g. these are not filenames) # Phony targets (e.g. these are not filenames)
.PHONY: all clean \ .PHONY: all clean
$(JDK_ALL_TEST_LIST) $(JDK_META_TEST_LIST) $(JDK_JCK7_LIST) \
$(LANGTOOLS_TEST_LIST)
################################################################ ################################################################