diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:01:25 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-02 22:01:25 +0000 |
| commit | e4b9c93fc1b531fe0cfe25a042f6b81c1e7c15c0 (patch) | |
| tree | 1656513dd240b9ed4690589b9934d0e5371694fb /utils/unittest/googletest/gtest-typed-test.cc | |
| parent | 18f30e6f5e80787808fe1455742452a5210afe07 (diff) | |
Merge gtest-1.3.0.
OSX users: make sure that CrashReporter is disabled when running unit tests.
Death tests are enabled now so you'll get a ton of message boxes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105352 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest/googletest/gtest-typed-test.cc')
| -rw-r--r-- | utils/unittest/googletest/gtest-typed-test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/unittest/googletest/gtest-typed-test.cc b/utils/unittest/googletest/gtest-typed-test.cc index d42a1596d5..e45e2abb56 100644 --- a/utils/unittest/googletest/gtest-typed-test.cc +++ b/utils/unittest/googletest/gtest-typed-test.cc @@ -35,7 +35,7 @@ namespace testing { namespace internal { -#ifdef GTEST_HAS_TYPED_TEST_P +#if GTEST_HAS_TYPED_TEST_P // Verifies that registered_tests match the test names in // defined_test_names_; returns registered_tests if successful, or @@ -85,6 +85,7 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames( if (errors_str != "") { fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), errors_str.c_str()); + fflush(stderr); abort(); } |