Merge
authorprr
Mon, 14 Sep 2015 09:33:37 -0700
changeset 32567 18cbcab4b68f
parent 32566 1b91995d38a7 (diff)
parent 32550 6521875cb63e (current diff)
child 32568 fc5205c29b31
Merge
jdk/make/src/native/add_gnu_debuglink/add_gnu_debuglink.c
jdk/make/src/native/fix_empty_sec_hdr_flags/fix_empty_sec_hdr_flags.c
jdk/src/java.base/unix/native/libnet/AbstractPlainDatagramSocketImpl.c
jdk/src/java.base/windows/native/libnet/AbstractPlainDatagramSocketImpl.c
langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/server/CompilationResult.java
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/BoundScriptFunctionImpl.java
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/PrototypeObject.java
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/ScriptFunctionImpl.java
--- a/test/Makefile	Wed Jul 05 20:49:25 2017 +0200
+++ b/test/Makefile	Mon Sep 14 09:33:37 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_,,$@))