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
e5e846da
Commit
e5e846da
authored
Feb 13, 2019
by
Gennadiy Civil
Browse files
Merge pull request #2120 from ngie-eign:clang-compile-with-basic-warns-flags
PiperOrigin-RevId: 233762520
parents
75c33960
1ded8319
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
googletest/cmake/internal_utils.cmake
googletest/cmake/internal_utils.cmake
+4
-0
googletest/docs/advanced.md
googletest/docs/advanced.md
+5
-4
No files found.
googletest/cmake/internal_utils.cmake
View file @
e5e846da
...
@@ -77,6 +77,10 @@ macro(config_compiler_and_linker)
...
@@ -77,6 +77,10 @@ macro(config_compiler_and_linker)
# Suppress "unreachable code" warning
# Suppress "unreachable code" warning
# http://stackoverflow.com/questions/3232669 explains the issue.
# http://stackoverflow.com/questions/3232669 explains the issue.
set
(
cxx_base_flags
"
${
cxx_base_flags
}
-wd4702"
)
set
(
cxx_base_flags
"
${
cxx_base_flags
}
-wd4702"
)
elseif
(
CMAKE_CXX_COMPILER_ID STREQUAL
"Clang"
)
set
(
cxx_base_flags
"-Wall -Wshadow -Werror"
)
set
(
cxx_exception_flags
"-fexceptions"
)
set
(
cxx_no_exception_flags
"-fno-exceptions"
)
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
elseif
(
CMAKE_COMPILER_IS_GNUCXX
)
set
(
cxx_base_flags
"-Wall -Wshadow -Werror"
)
set
(
cxx_base_flags
"-Wall -Wshadow -Werror"
)
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0
)
if
(
NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0.0
)
...
...
googletest/docs/advanced.md
View file @
e5e846da
...
@@ -2430,7 +2430,7 @@ could generate this report:
...
@@ -2430,7 +2430,7 @@ could generate this report:
"failures"
:
1
,
"failures"
:
1
,
"errors"
:
0
,
"errors"
:
0
,
"time"
:
"0.035s"
,
"time"
:
"0.035s"
,
"timestamp"
:
"2011-10-31T18:52:42Z"
,
"timestamp"
:
"2011-10-31T18:52:42Z"
"name"
:
"AllTests"
,
"name"
:
"AllTests"
,
"testsuites"
:
[
"testsuites"
:
[
{
{
...
@@ -2447,11 +2447,11 @@ could generate this report:
...
@@ -2447,11 +2447,11 @@ could generate this report:
"classname"
:
""
,
"classname"
:
""
,
"failures"
:
[
"failures"
:
[
{
{
"message"
:
"Value of: add(1, 1)
\
n
Actual: 3
\
n
Expected: 2"
,
"message"
:
"Value of: add(1, 1)
\
x
0A
Actual: 3
\
x
0A
Expected: 2"
,
"type"
:
""
"type"
:
""
},
},
{
{
"message"
:
"Value of: add(1, -1)
\
n
Actual: 1
\
n
Expected: 0"
,
"message"
:
"Value of: add(1, -1)
\
x
0A
Actual: 1
\
x
0A
Expected: 0"
,
"type"
:
""
"type"
:
""
}
}
]
]
...
@@ -2463,7 +2463,7 @@ could generate this report:
...
@@ -2463,7 +2463,7 @@ could generate this report:
"classname"
:
""
"classname"
:
""
}
}
]
]
}
,
}
{
{
"name"
:
"LogicTest"
,
"name"
:
"LogicTest"
,
"tests"
:
1
,
"tests"
:
1
,
...
@@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
...
@@ -2517,3 +2517,4 @@ environment variable to `0`, or use the `--gtest_catch_exceptions=0` flag when
running the tests.
running the tests.
**Availability**
: Linux, Windows, Mac.
**Availability**
: Linux, Windows, Mac.
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