diff options
| author | Sam McCall <sam.mccall@gmail.com> | 2019-08-21 13:56:29 +0000 |
|---|---|---|
| committer | Sam McCall <sam.mccall@gmail.com> | 2019-08-21 13:56:29 +0000 |
| commit | f6a2334f1ea6f1f833cce6a92cb48364b41afd17 (patch) | |
| tree | d23a69511424df1c80bbb84955bd3f5b160d5607 | |
| parent | e52749ced386eadf7efe931910f38747ec690ff6 (diff) | |
| download | compiler-rt-f6a2334f1ea6f1f833cce6a92cb48364b41afd17.tar.gz | |
reland [gtest] Fix printing of StringRef and SmallString in assert messages.
Renames GTEST_NO_LLVM_RAW_OSTREAM -> GTEST_NO_LLVM_SUPPORT and guards
the new features behind it.
This reverts commit a063bcf3ef5a879adbe9639a3c187d876eee0e66.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@369527 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | cmake/Modules/AddCompilerRT.cmake | 4 | ||||
| -rw-r--r-- | lib/fuzzer/tests/FuzzerUnittest.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmake/Modules/AddCompilerRT.cmake b/cmake/Modules/AddCompilerRT.cmake index f7ee932f2..322e4221a 100644 --- a/cmake/Modules/AddCompilerRT.cmake +++ b/cmake/Modules/AddCompilerRT.cmake @@ -360,7 +360,7 @@ set(COMPILER_RT_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_CFLAGS}) set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest) set(COMPILER_RT_GTEST_SOURCE ${COMPILER_RT_GTEST_PATH}/src/gtest-all.cc) set(COMPILER_RT_GTEST_CFLAGS - -DGTEST_NO_LLVM_RAW_OSTREAM=1 + -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I${COMPILER_RT_GTEST_PATH}/include -I${COMPILER_RT_GTEST_PATH} @@ -370,7 +370,7 @@ set(COMPILER_RT_GTEST_CFLAGS set(COMPILER_RT_GMOCK_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googlemock) set(COMPILER_RT_GMOCK_SOURCE ${COMPILER_RT_GMOCK_PATH}/src/gmock-all.cc) set(COMPILER_RT_GMOCK_CFLAGS - -DGTEST_NO_LLVM_RAW_OSTREAM=1 + -DGTEST_NO_LLVM_SUPPORT=1 -DGTEST_HAS_RTTI=0 -I${COMPILER_RT_GMOCK_PATH}/include -I${COMPILER_RT_GMOCK_PATH} diff --git a/lib/fuzzer/tests/FuzzerUnittest.cpp b/lib/fuzzer/tests/FuzzerUnittest.cpp index abb203d51..7fc4b9a55 100644 --- a/lib/fuzzer/tests/FuzzerUnittest.cpp +++ b/lib/fuzzer/tests/FuzzerUnittest.cpp @@ -6,8 +6,8 @@ // with ASan) involving C++ standard library types when using libcxx. #define _LIBCPP_HAS_NO_ASAN -// Do not attempt to use LLVM ostream from gtest. -#define GTEST_NO_LLVM_RAW_OSTREAM 1 +// Do not attempt to use LLVM ostream etc from gtest. +#define GTEST_NO_LLVM_SUPPORT 1 #include "FuzzerCorpus.h" #include "FuzzerDictionary.h" |