diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-30 22:02:47 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2011-03-30 22:02:47 +0000 |
| commit | 5298efaeffba66024a9c530f4b6576dd79a6c5b5 (patch) | |
| tree | ac6f5d0773cfd127db658808733a70bfe5c30ff5 /test | |
| parent | 9beddf89f4372081229ad12f3126952658da9081 (diff) | |
| download | googletest-5298efaeffba66024a9c530f4b6576dd79a6c5b5.tar.gz | |
Fixes Windows CE compatibility problem (issue http://code.google.com/p/googletest/issues/detail?id=362).
git-svn-id: http://googletest.googlecode.com/svn/trunk@559 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest_environment_test.cc | 2 | ||||
| -rw-r--r-- | test/gtest_repeat_test.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/gtest_environment_test.cc b/test/gtest_environment_test.cc index 744b405..ec9aa2c 100644 --- a/test/gtest_environment_test.cc +++ b/test/gtest_environment_test.cc @@ -115,7 +115,7 @@ TEST(FooTest, Bar) { void Check(bool condition, const char* msg) { if (!condition) { printf("FAILED: %s\n", msg); - abort(); + testing::internal::posix::Abort(); } } diff --git a/test/gtest_repeat_test.cc b/test/gtest_repeat_test.cc index ff9063a..5223dc0 100644 --- a/test/gtest_repeat_test.cc +++ b/test/gtest_repeat_test.cc @@ -69,7 +69,7 @@ namespace { << " Actual: " << actual_val << "\n"\ << "Expected: " #expected "\n"\ << "Which is: " << expected_val << "\n";\ - abort();\ + ::testing::internal::posix::Abort();\ }\ } while(::testing::internal::AlwaysFalse()) @@ -113,10 +113,10 @@ TEST(BarDeathTest, ThreadSafeAndFast) { g_death_test_count++; GTEST_FLAG(death_test_style) = "threadsafe"; - EXPECT_DEATH_IF_SUPPORTED(abort(), ""); + EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), ""); GTEST_FLAG(death_test_style) = "fast"; - EXPECT_DEATH_IF_SUPPORTED(abort(), ""); + EXPECT_DEATH_IF_SUPPORTED(::testing::internal::posix::Abort(), ""); } #if GTEST_HAS_PARAM_TEST |