Googletest export
Silence MSVC warnings PiperOrigin-RevId: 210726964
This commit is contained in:
parent
00d1ffc8c8
commit
41b539941f
|
@ -39,6 +39,10 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#if _MSC_VER
|
||||||
|
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#if GTEST_IS_THREADSAFE
|
#if GTEST_IS_THREADSAFE
|
||||||
using testing::ScopedFakeTestPartResultReporter;
|
using testing::ScopedFakeTestPartResultReporter;
|
||||||
using testing::TestPartResultArray;
|
using testing::TestPartResultArray;
|
||||||
|
@ -1098,6 +1102,8 @@ int main(int argc, char **argv) {
|
||||||
// are registered, and torn down in the reverse order.
|
// are registered, and torn down in the reverse order.
|
||||||
testing::AddGlobalTestEnvironment(new FooEnvironment);
|
testing::AddGlobalTestEnvironment(new FooEnvironment);
|
||||||
testing::AddGlobalTestEnvironment(new BarEnvironment);
|
testing::AddGlobalTestEnvironment(new BarEnvironment);
|
||||||
|
#if _MSC_VER
|
||||||
|
GTEST_DISABLE_MSC_WARNINGS_POP_() // 4127
|
||||||
|
#endif // _MSC_VER
|
||||||
return RunAllTests();
|
return RunAllTests();
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,10 @@
|
||||||
|
|
||||||
#include "gtest/gtest.h"
|
#include "gtest/gtest.h"
|
||||||
|
|
||||||
|
#if _MSC_VER
|
||||||
|
GTEST_DISABLE_MSC_WARNINGS_PUSH_(4127 /* conditional expression is constant */)
|
||||||
|
#endif // _MSC_VER
|
||||||
|
|
||||||
using testing::Test;
|
using testing::Test;
|
||||||
|
|
||||||
// Used for testing that SetUpTestCase()/TearDownTestCase(), fixture
|
// 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.
|
// must be defined). This dummy test keeps gtest_main linked in.
|
||||||
TEST(DummyTest, TypedTestsAreNotSupportedOnThisPlatform) {}
|
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)
|
#endif // #if !defined(GTEST_HAS_TYPED_TEST) && !defined(GTEST_HAS_TYPED_TEST_P)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user