Mercurial > hg > jdk9-shenandoah

changeset 1648:9a535155e58e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author prr
date Fri, 18 Sep 2015 09:21:07 -0700
parents 5e2e32545763 (diff) 42ea2b79145f (current diff)
children ce5c14d97d95
files test/lib/Makefile
diffstat 2 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/common/NativeCompilation.gmk	Thu Sep 17 08:55:39 2015 -0700
+++ b/make/common/NativeCompilation.gmk	Fri Sep 18 09:21:07 2015 -0700
@@ -102,7 +102,7 @@
 ################################################################################
 
 # Extensions of files handled by this macro.
-NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.m %.mm
+NATIVE_SOURCE_EXTENSIONS := %.s %.c %.cpp %.cc %.m %.mm
 
 # Replaces native source extensions with the object file extension in a string.
 # Param 1: the string containing source file names with extensions
@@ -167,7 +167,7 @@
     $1_$2_FLAGS=$8 -DTHIS_FILE='"$$(<F)"'
     $1_$2_COMP=$(AS)
     $1_$2_DEP_FLAG:=
-  else ifneq (,$$(filter %.cpp,$2)$$(filter %.mm,$2))
+  else ifneq (,$$(filter %.cpp,$2)$$(filter %.cc,$2)$$(filter %.mm,$2))
     # Compile as a C++ or Objective-C++ file
     $1_$2_FLAGS=$(CFLAGS_CCACHE) $6 $$($1_$(notdir $2)_CXXFLAGS) -DTHIS_FILE='"$$(<F)"' -c
     $1_$2_COMP=$7
--- a/test/Makefile	Thu Sep 17 08:55:39 2015 -0700
+++ b/test/Makefile	Fri Sep 18 09:21:07 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_,,$@))