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

Merge

Browse Source
This commit is contained in:
J. Duke 2017-07-05 17:09:27 +02:00
commit df7baf1689
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags-top-repo
View File

@ -62,3 +62,4 @@ e1176f86805fe07fd9fb9da065dc51b47712ce76 jdk7-b82
cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85 cf26288a114be67c39f2758959ce50b60f5ae330 jdk7-b85
433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88

2
make/jprt.properties
View File

@ -62,6 +62,7 @@ jprt.test.targets= \
# Test targets in test/Makefile # Test targets in test/Makefile
jprt.make.rule.test.targets= \ jprt.make.rule.test.targets= \
*-product-*-langtools_jtreg, \
*-product-*-jdk_beans1, \ *-product-*-jdk_beans1, \
*-product-*-jdk_beans2, \ *-product-*-jdk_beans2, \
*-product-*-jdk_beans3, \ *-product-*-jdk_beans3, \
@ -84,7 +85,6 @@ jprt.make.rule.test.targets= \
*-product-*-jdk_util *-product-*-jdk_util
# Not Ready Yet: # Not Ready Yet:
# *-product-*-langtools_all
# *-product-*-jdk_awt # *-product-*-jdk_awt
# *-product-*-jdk_rmi # *-product-*-jdk_rmi
# *-product-*-jdk_swing # *-product-*-jdk_swing

5
test/Makefile
View File

@ -42,6 +42,7 @@ if [ -d $1 ] ; then \
$(MAKE) -C $1/test $2 ; \ $(MAKE) -C $1/test $2 ; \
else \ else \
echo "ERROR: File does not exist: $1/test/Makefile"; \ echo "ERROR: File does not exist: $1/test/Makefile"; \
exit 1; \
fi; \ fi; \
else \ else \
echo "WARNING: No testing done, directory does not exist: $1"; \ echo "WARNING: No testing done, directory does not exist: $1"; \
@ -49,7 +50,7 @@ fi
endef endef
# Test target list for langtools repository # Test target list for langtools repository
LANGTOOLS_TEST_LIST = langtools_all LANGTOOLS_TEST_LIST = langtools_jtreg
# Test target list for jdk repository # Test target list for jdk repository
JDK_TEST_LIST = \ JDK_TEST_LIST = \
@ -74,7 +75,7 @@ all: $(JDK_TEST_LIST) $(LANGTOOLS_TEST_LIST)
# Test targets # Test targets
$(LANGTOOLS_TEST_LIST): $(LANGTOOLS_TEST_LIST):
@$(call SUBDIR_TEST, $(LANGTOOLS_DIR), all) @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@))
$(JDK_TEST_LIST): $(JDK_TEST_LIST):
@$(call SUBDIR_TEST, $(JDK_DIR), $@) @$(call SUBDIR_TEST, $(JDK_DIR), $@)