From 744de6fa59f81232f0d82fc9b35c4aa0f9ccb5c0 Mon Sep 17 00:00:00 2001 From: "zhanyong.wan" Date: Thu, 22 Jul 2010 22:03:48 +0000 Subject: Removes unused scons-related scripts; makes gtest_nc_test compatible with Clang. --- test/gtest_nc_test.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'test/gtest_nc_test.py') 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']), -- cgit v1.2.3