eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merges and also adding new bazel build mode

Browse Source
This commit is contained in:
Gennadiy Civil 2018-01-31 12:05:18 -05:00
parent 9f2c3d4cac
commit d9df92287e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.bazel
View File

@ -104,6 +104,7 @@ cc_library(
deps = select ({ deps = select ({
":has_absl": [ ":has_absl": [
"@com_google_absl//absl/types:optional", "@com_google_absl//absl/types:optional",
"@com_google_absl//absl/strings"
], ],
"//conditions:default": [], "//conditions:default": [],
} }

1
ci/build-linux-bazel.sh
View File

@ -33,3 +33,4 @@ set -e
bazel build --curses=no //...:all bazel build --curses=no //...:all
bazel test --curses=no //...:all bazel test --curses=no //...:all
bazel test --curses=no //...:all --define absl=1

3
googletest/include/gtest/gtest-printers.h
View File

@ -113,6 +113,7 @@
#if GTEST_HAS_ABSL #if GTEST_HAS_ABSL
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "absl/strings/string_view.h"
#endif // GTEST_HAS_ABSL #endif // GTEST_HAS_ABSL
namespace testing { namespace testing {
@ -629,7 +630,7 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
#if GTEST_HAS_ABSL #if GTEST_HAS_ABSL
// Overload for absl::string_view. // Overload for absl::string_view.
inline void PrintTo(absl::string_view sp, ::std::ostream* os) { inline void PrintTo(absl::string_view sp, ::std::ostream* os) {
PrintTo(string(sp), os); PrintTo(::std::string(sp), os);
} }
#endif // GTEST_HAS_ABSL #endif // GTEST_HAS_ABSL