Merge
This commit is contained in:
commit
395aa36b95
@ -62,6 +62,7 @@ jprt.test.targets= \
|
||||
|
||||
# Test targets in test/Makefile
|
||||
jprt.make.rule.test.targets= \
|
||||
*-product-*-langtools_jtreg, \
|
||||
*-product-*-jdk_beans1, \
|
||||
*-product-*-jdk_beans2, \
|
||||
*-product-*-jdk_beans3, \
|
||||
@ -84,7 +85,6 @@ jprt.make.rule.test.targets= \
|
||||
*-product-*-jdk_util
|
||||
|
||||
# Not Ready Yet:
|
||||
# *-product-*-langtools_all
|
||||
# *-product-*-jdk_awt
|
||||
# *-product-*-jdk_rmi
|
||||
# *-product-*-jdk_swing
|
||||
|
@ -42,6 +42,7 @@ if [ -d $1 ] ; then \
|
||||
$(MAKE) -C $1/test $2 ; \
|
||||
else \
|
||||
echo "ERROR: File does not exist: $1/test/Makefile"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
else \
|
||||
echo "WARNING: No testing done, directory does not exist: $1"; \
|
||||
@ -49,7 +50,7 @@ fi
|
||||
endef
|
||||
|
||||
# Test target list for langtools repository
|
||||
LANGTOOLS_TEST_LIST = langtools_all
|
||||
LANGTOOLS_TEST_LIST = langtools_jtreg
|
||||
|
||||
# Test target list for jdk repository
|
||||
JDK_TEST_LIST = \
|
||||
@ -74,7 +75,7 @@ all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
|
||||
|
||||
# Test targets
|
||||
$(LANGTOOLS_TEST_LIST):
|
||||
@$(call SUBDIR_TEST, $(LANGTOOLS_DIR), all)
|
||||
@$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
|
||||
$(JDK_TEST_LIST):
|
||||
@$(call SUBDIR_TEST, $(JDK_DIR), $@)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user