changeset 11268:67bc9d6f1d94

8157325: gtest tests are not excluded for minimal builds Reviewed-by: erikj, jwilhelm Contributed-by: erik.joelsson@oracle.com
author ehelin
date Thu, 19 May 2016 11:43:21 +0200
parents 6586b45fe833
children 14c4374d3346 eaae94e22dbb
files make/lib/CompileGtest.gmk
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/lib/CompileGtest.gmk	Wed May 18 11:06:00 2016 +0200
+++ b/make/lib/CompileGtest.gmk	Thu May 19 11:43:21 2016 +0200
@@ -36,9 +36,6 @@
 
 ################################################################################
 
-GTEST_TEST_SRC_FILES := $(shell $(FIND) $(HOTSPOT_TOPDIR)/test/native -name \
-    "test*.cpp" -type f)
-
 ifeq ($(OPENJDK_TARGET_OS), windows)
   GTEST_JVM_MAPFILE := $(JVM_MAPFILE)
 else
@@ -58,10 +55,12 @@
     TOOLCHAIN := $(JVM_TOOLCHAIN), \
     LIBRARY := jvm, \
     OUTPUT_DIR := $(JVM_OUTPUTDIR)/gtest, \
-    EXTRA_FILES := $(GTEST_TEST_SRC_FILES) \
-        $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc \
-        $(GTEST_TEST_SRC)/gtestMain.cpp, \
     OBJECT_DIR := $(JVM_OUTPUTDIR)/gtest/objs, \
+    SRC := $(GTEST_TEST_SRC), \
+    EXCLUDES := $(JVM_EXCLUDES), \
+    EXCLUDE_FILES := gtestLauncher.cpp, \
+    EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
+    EXTRA_FILES := $(GTEST_FRAMEWORK_SRC)/src/gtest-all.cc, \
     EXTRA_OBJECT_FILES := $(filter-out %/operator_new$(OBJ_SUFFIX), \
         $(BUILD_LIBJVM_ALL_OBJS)), \
     CFLAGS := $(JVM_CFLAGS) -I$(GTEST_FRAMEWORK_SRC) \