Tue, 13 Apr 2010 16:35:53 -0700
Merge
1.1 --- a/make/jprt.properties Thu Apr 08 17:02:36 2010 -0700 1.2 +++ b/make/jprt.properties Tue Apr 13 16:35:53 2010 -0700 1.3 @@ -62,6 +62,7 @@ 1.4 1.5 # Test targets in test/Makefile 1.6 jprt.make.rule.test.targets= \ 1.7 + *-product-*-langtools_jtreg, \ 1.8 *-product-*-jdk_beans1, \ 1.9 *-product-*-jdk_beans2, \ 1.10 *-product-*-jdk_beans3, \ 1.11 @@ -84,7 +85,6 @@ 1.12 *-product-*-jdk_util 1.13 1.14 # Not Ready Yet: 1.15 -# *-product-*-langtools_all 1.16 # *-product-*-jdk_awt 1.17 # *-product-*-jdk_rmi 1.18 # *-product-*-jdk_swing
2.1 --- a/test/Makefile Thu Apr 08 17:02:36 2010 -0700 2.2 +++ b/test/Makefile Tue Apr 13 16:35:53 2010 -0700 2.3 @@ -42,6 +42,7 @@ 2.4 $(MAKE) -C $1/test $2 ; \ 2.5 else \ 2.6 echo "ERROR: File does not exist: $1/test/Makefile"; \ 2.7 + exit 1; \ 2.8 fi; \ 2.9 else \ 2.10 echo "WARNING: No testing done, directory does not exist: $1"; \ 2.11 @@ -49,7 +50,7 @@ 2.12 endef 2.13 2.14 # Test target list for langtools repository 2.15 -LANGTOOLS_TEST_LIST = langtools_all 2.16 +LANGTOOLS_TEST_LIST = langtools_jtreg 2.17 2.18 # Test target list for jdk repository 2.19 JDK_TEST_LIST = \ 2.20 @@ -74,7 +75,7 @@ 2.21 2.22 # Test targets 2.23 $(LANGTOOLS_TEST_LIST): 2.24 - @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), all) 2.25 + @$(call SUBDIR_TEST, $(LANGTOOLS_DIR), $(subst langtools_,,$@)) 2.26 $(JDK_TEST_LIST): 2.27 @$(call SUBDIR_TEST, $(JDK_DIR), $@) 2.28