Merge
authorlana
Thu, 18 Mar 2010 18:50:22 -0700
changeset 5114 27cccdaba851
parent 5113 85992faf57f5 (diff)
parent 5020 c94d9cc81f49 (current diff)
child 5115 204e24e427b0
Merge
jdk/test/java/nio/file/WatchService/OverflowEventIsLoner.java
langtools/test/tools/javac/treepostests/TreePosTest.java
--- a/make/jprt.properties	Wed Jul 05 17:08:23 2017 +0200
+++ b/make/jprt.properties	Thu Mar 18 18:50:22 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
--- a/test/Makefile	Wed Jul 05 17:08:23 2017 +0200
+++ b/test/Makefile	Thu Mar 18 18:50:22 2010 -0700
@@ -49,7 +49,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 +74,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), $@)