From a4d7c77789ad1e0b327d9863c229d8f82ee1c038 Mon Sep 17 00:00:00 2001
From: Jonathan Gibbons <jjg@openjdk.org>
Date: Fri, 12 Mar 2010 15:22:50 -0800
Subject: [PATCH 1/3] 6934712: run langtools jtreg tests from top level
 test/Makefile

Reviewed-by: ohair
---
 test/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index bf9a4a1daf0..0888529a92b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -49,7 +49,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 +74,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), $@)
 

From c21467f5549f69b5bc4067b624dd7de900017458 Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Fri, 12 Mar 2010 17:44:50 -0800
Subject: [PATCH 2/3] 6934759: Add langtools testing to jprt control builds

Reviewed-by: jjg
---
 make/jprt.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make/jprt.properties b/make/jprt.properties
index f08ea270041..54d64ae3b6a 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -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

From 235a0d94bdc997dc9ecfdf73ca3a4553253bbe3f Mon Sep 17 00:00:00 2001
From: Kelly O'Hair <ohair@openjdk.org>
Date: Fri, 19 Mar 2010 18:17:49 -0700
Subject: [PATCH 3/3] 6936788: Minor adjustment to top repo test/Makefile,
 missing non-zero exit case

Reviewed-by: jjg
---
 test/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Makefile b/test/Makefile
index 0888529a92b..00e532eda8f 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -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"; \