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
41b53994
Commit
41b53994
authored
Aug 29, 2018
by
misterg
Committed by
Gennadiy Civil
Aug 30, 2018
Browse files
Googletest export
Silence MSVC warnings PiperOrigin-RevId: 210726964
parent
00d1ffc8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
googletest/test/googletest-output-test_.cc
googletest/test/googletest-output-test_.cc
+7
-1
googletest/test/gtest-typed-test_test.cc
googletest/test/gtest-typed-test_test.cc
+8
-0
No files found.
googletest/test/googletest-output-test_.cc
View file @
41b53994
...
...
@@ -39,6 +39,10 @@
#include <stdlib.h>
#if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4127
/* conditional expression is constant */
)
#endif // _MSC_VER
#if GTEST_IS_THREADSAFE
using
testing
::
ScopedFakeTestPartResultReporter
;
using
testing
::
TestPartResultArray
;
...
...
@@ -1098,6 +1102,8 @@ int main(int argc, char **argv) {
// are registered, and torn down in the reverse order.
testing
::
AddGlobalTestEnvironment
(
new
FooEnvironment
);
testing
::
AddGlobalTestEnvironment
(
new
BarEnvironment
);
#if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4127
#endif // _MSC_VER
return
RunAllTests
();
}
googletest/test/gtest-typed-test_test.cc
View file @
41b53994
...
...
@@ -35,6 +35,10 @@
#include "gtest/gtest.h"
#if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_PUSH_
(
4127
/* conditional expression is constant */
)
#endif // _MSC_VER
using
testing
::
Test
;
// Used for testing that SetUpTestCase()/TearDownTestCase(), fixture
...
...
@@ -450,4 +454,8 @@ INSTANTIATE_TYPED_TEST_CASE_P(My, TrimmedTest, TrimTypes);
// must be defined). This dummy test keeps gtest_main linked in.
TEST
(
DummyTest
,
TypedTestsAreNotSupportedOnThisPlatform
)
{}
#if _MSC_VER
GTEST_DISABLE_MSC_WARNINGS_POP_
()
// 4127
#endif // _MSC_VER
#endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
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