Merge
authorprr
Tue, 08 Sep 2015 14:40:19 -0700
changeset 32566 1b91995d38a7
parent 32565 77ad9375337e (diff)
parent 32457 2050b3a0aadc (current diff)
child 32567 18cbcab4b68f
Merge
hotspot/src/share/vm/gc/g1/g1CollectorPolicy_ext.hpp
jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
jdk/src/java.base/unix/native/libnio/fs/GnomeFileTypeDetector.c
langtools/test/tools/javac/TestBootstrapMethodsCount.java
langtools/test/tools/javac/lib/JavacTestingAbstractThreadedTest.java
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/AstSerializer.java
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/arrays/InvalidArrayIndexException.java
--- a/test/Makefile	Wed Jul 05 20:48:33 2017 +0200
+++ b/test/Makefile	Tue Sep 08 14:40:19 2015 -0700
@@ -57,6 +57,9 @@
 # All testing
 all: jdk_all langtools_all jaxp_all
 
+# Bring in closed test targets if present
+-include $(TOPDIR)/closed/test/Makefile
+
 # Test targets
 langtools_% :
 	@$(NO_STOPPING)$(call SUBDIR_TEST, $(LANGTOOLS_DIR), JT_JAVA=$(PRODUCT_HOME) JTREG_HOME=$(JT_HOME) TEST="$(subst langtools_,,$@)" $(subst langtools_,,$@))