diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-07-22 22:03:48 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-07-22 22:03:48 +0000 |
| commit | 744de6fa59f81232f0d82fc9b35c4aa0f9ccb5c0 (patch) | |
| tree | 442c24cc712a094fc1ed4512cb82a4932e8722bc /test/gtest_nc_test.py | |
| parent | e96d247b20116646f343b6e2ec37af154f655977 (diff) | |
| download | googletest-744de6fa59f81232f0d82fc9b35c4aa0f9ccb5c0.tar.gz googletest-744de6fa59f81232f0d82fc9b35c4aa0f9ccb5c0.tar.bz2 googletest-744de6fa59f81232f0d82fc9b35c4aa0f9ccb5c0.zip | |
Removes unused scons-related scripts; makes gtest_nc_test compatible with Clang.
Diffstat (limited to 'test/gtest_nc_test.py')
| -rwxr-xr-x | test/gtest_nc_test.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/test/gtest_nc_test.py b/test/gtest_nc_test.py index 06ffb3f8..bf09234a 100755 --- a/test/gtest_nc_test.py +++ b/test/gtest_nc_test.py @@ -72,19 +72,27 @@ class GTestNCTest(unittest.TestCase): [r'Setup_should_be_spelled_SetUp']), ('CATCHES_WRONG_CASE_IN_TYPED_TEST_P', - [r'BarTest.*was not declared']), + [r'BarTest.*was not declared', # GCC + r'undeclared identifier .*BarTest', # Clang + ]), ('CATCHES_WRONG_CASE_IN_REGISTER_TYPED_TEST_CASE_P', - [r'BarTest.*was not declared']), + [r'BarTest.*was not declared', # GCC + r'undeclared identifier .*BarTest', # Clang + ]), ('CATCHES_WRONG_CASE_IN_INSTANTIATE_TYPED_TEST_CASE_P', - [r'BarTest.*not declared']), + [r'BarTest.*not declared', # GCC + r'undeclared identifier .*BarTest', # Clang + ]), ('CATCHES_INSTANTIATE_TYPED_TESET_CASE_P_WITH_SAME_NAME_PREFIX', [r'redefinition of.*My.*FooTest']), ('STATIC_ASSERT_TYPE_EQ_IS_NOT_A_TYPE', - [r'StaticAssertTypeEq.* does not name a type']), + [r'StaticAssertTypeEq.* does not name a type', # GCC + r'requires a type.*\n.*StaticAssertTypeEq', # Clang + ]), ('STATIC_ASSERT_TYPE_EQ_WORKS_IN_NAMESPACE', [r'StaticAssertTypeEq.*int.*const int']), |