changeset 39394:044a0eb96215

8159364: Gtest unit tests does not support PCH Reviewed-by: erikj, jwilhelm, gtriantafill
author ehelin
date Mon, 13 Jun 2016 13:48:37 +0200
parents 93730d02bec3
children af07388255fc
files hotspot/make/lib/CompileGtest.gmk hotspot/test/native/runtime/test_classLoader.cpp hotspot/test/native/runtime/test_instanceKlass.cpp hotspot/test/native/runtime/test_os.cpp hotspot/test/native/utilities/test_quicksort.cpp
diffstat 5 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/make/lib/CompileGtest.gmk	Mon Jun 13 11:22:23 2016 +0200
+++ b/hotspot/make/lib/CompileGtest.gmk	Mon Jun 13 13:48:37 2016 +0200
@@ -76,7 +76,7 @@
     CXXFLAGS_DEBUG_SYMBOLS := $(JVM_CFLAGS_SYMBOLS), \
     DISABLED_WARNINGS_gcc := undef, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
-        tautological-undefined-compare, \
+        tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_solstudio := identexpected, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -86,6 +86,8 @@
     USE_MAPFILE_FOR_SYMBOLS := true, \
     COPY_DEBUG_SYMBOLS := $(GTEST_COPY_DEBUG_SYMBOLS), \
     ZIP_EXTERNAL_DEBUG_SYMBOLS := false, \
+    PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
+    PRECOMPILED_HEADER_EXCLUDE := gtest-all.cc gtestMain.cpp, \
 ))
 
 TARGETS += $(BUILD_GTEST_LIBJVM)
--- a/hotspot/test/native/runtime/test_classLoader.cpp	Mon Jun 13 11:22:23 2016 +0200
+++ b/hotspot/test/native/runtime/test_classLoader.cpp	Mon Jun 13 13:48:37 2016 +0200
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "classfile/classLoader.hpp"
 #include "memory/resourceArea.hpp"
 #include "unittest.hpp"
--- a/hotspot/test/native/runtime/test_instanceKlass.cpp	Mon Jun 13 11:22:23 2016 +0200
+++ b/hotspot/test/native/runtime/test_instanceKlass.cpp	Mon Jun 13 13:48:37 2016 +0200
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "classfile/symbolTable.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
--- a/hotspot/test/native/runtime/test_os.cpp	Mon Jun 13 11:22:23 2016 +0200
+++ b/hotspot/test/native/runtime/test_os.cpp	Mon Jun 13 13:48:37 2016 +0200
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"
 
--- a/hotspot/test/native/utilities/test_quicksort.cpp	Mon Jun 13 11:22:23 2016 +0200
+++ b/hotspot/test/native/utilities/test_quicksort.cpp	Mon Jun 13 13:48:37 2016 +0200
@@ -22,6 +22,7 @@
  *
  */
 
+#include "precompiled.hpp"
 #include "prims/jvm.h"
 #include "utilities/quickSort.hpp"
 #include "unittest.hpp"