Removes unused scons-related scripts; makes gtest_nc_test compatible with Clang.

run_tests.py

-#!/usr/bin/env python
-#
-# Copyright 2008, Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Runs the specified tests for Google Test.
-
-This script requires Python 2.3 or higher.  To learn the usage, run it
-with -h.
-"""
-
-import os
-import sys
-
-SCRIPT_DIR = os.path.dirname(__file__) or '.'
-
-sys.path.append(os.path.join(SCRIPT_DIR, 'test'))
-import run_tests_util
-
-
-def _Main():
-  """Runs all tests for Google Test."""
-
-  options, args = run_tests_util.ParseArgs('gtest')
-  test_runner = run_tests_util.TestRunner(script_dir=SCRIPT_DIR)
-  tests = test_runner.GetTestsToRun(args,
-                                    options.configurations,
-                                    options.built_configurations)
-  if not tests:
-    sys.exit(1)  # Incorrect parameters given, abort execution.
-
-  sys.exit(test_runner.RunTests(tests[0], tests[1]))
-
-if __name__ == '__main__':
-  _Main()

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']),