Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
e6ec8bc5
Commit
e6ec8bc5
authored
Jan 31, 2018
by
Gennadiy Civil
Browse files
Merges and also adding new bazel build mode
parent
e55fded0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
1 deletion
+4
-1
BUILD.bazel
BUILD.bazel
+1
-0
ci/build-linux-bazel.sh
ci/build-linux-bazel.sh
+1
-0
googletest/include/gtest/gtest-printers.h
googletest/include/gtest/gtest-printers.h
+2
-1
No files found.
BUILD.bazel
View file @
e6ec8bc5
...
...
@@ -104,6 +104,7 @@ cc_library(
deps
=
select
({
":has_absl"
:
[
"@com_google_absl//absl/types:optional"
,
"@com_google_absl//absl/strings"
],
"//conditions:default"
:
[],
}
...
...
ci/build-linux-bazel.sh
View file @
e6ec8bc5
...
...
@@ -33,3 +33,4 @@ set -e
bazel build
--curses
=
no //...:all
bazel
test
--curses
=
no //...:all
bazel
test
--curses
=
no //...:all
--define
absl
=
1
googletest/include/gtest/gtest-printers.h
View file @
e6ec8bc5
...
...
@@ -113,6 +113,7 @@
#if GTEST_HAS_ABSL
#include "absl/types/optional.h"
#include "absl/strings/string_view.h"
#endif // GTEST_HAS_ABSL
namespace
testing
{
...
...
@@ -629,7 +630,7 @@ inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
#if GTEST_HAS_ABSL
// Overload for absl::string_view.
inline
void
PrintTo
(
absl
::
string_view
sp
,
::
std
::
ostream
*
os
)
{
PrintTo
(
string
(
sp
),
os
);
PrintTo
(
::
std
::
string
(
sp
),
os
);
}
#endif // GTEST_HAS_ABSL
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment