# HG changeset patch
# User lana
# Date 1271201753 25200
# Node ID e996369c787b48c5a105947b3cc64ed119d2ef8b
# Parent  67916ae3220da954761670002462fca16da9718a# Parent  ffde6191f84da48cba72cc8a56c1b6518f65930b
Merge

diff -r 67916ae3220d -r e996369c787b make/jprt.properties
--- a/make/jprt.properties	Thu Apr 08 17:02:36 2010 -0700
+++ b/make/jprt.properties	Tue Apr 13 16:35:53 2010 -0700
@@ -62,6 +62,7 @@
 
 # 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 @@
   *-product-*-jdk_util
 
 # Not Ready Yet:
-#   *-product-*-langtools_all
 #   *-product-*-jdk_awt
 #   *-product-*-jdk_rmi
 #   *-product-*-jdk_swing
diff -r 67916ae3220d -r e996369c787b test/Makefile
--- a/test/Makefile	Thu Apr 08 17:02:36 2010 -0700
+++ b/test/Makefile	Tue Apr 13 16:35:53 2010 -0700
@@ -42,6 +42,7 @@
     $(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 @@
 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 @@
 
 # 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), $@)