diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/gtest-port_test.cc | 4 | ||||
| -rwxr-xr-x | test/run_tests_test.py | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc index df59f9e8..0fbe5c51 100644 --- a/test/gtest-port_test.cc +++ b/test/gtest-port_test.cc @@ -161,6 +161,8 @@ TEST(GtestCheckDeathTest, LivesSilentlyOnSuccess) { #if GTEST_USES_POSIX_RE +#if GTEST_HAS_TYPED_TEST + template <typename Str> class RETest : public ::testing::Test {}; @@ -223,6 +225,8 @@ TYPED_TEST(RETest, PartialMatchWorks) { EXPECT_FALSE(RE::PartialMatch(TypeParam("zza"), re)); } +#endif // GTEST_HAS_TYPED_TEST + #elif GTEST_USES_SIMPLE_RE TEST(IsInSetTest, NulCharIsNotInAnySet) { diff --git a/test/run_tests_test.py b/test/run_tests_test.py index 79524a68..a9f0b5db 100755 --- a/test/run_tests_test.py +++ b/test/run_tests_test.py @@ -42,9 +42,9 @@ sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), os.pardir)) import run_tests -GTEST_DBG_DIR = 'scons/build/dbg/scons' -GTEST_OPT_DIR = 'scons/build/opt/scons' -GTEST_OTHER_DIR = 'scons/build/other/scons' +GTEST_DBG_DIR = 'scons/build/dbg/gtest/scons' +GTEST_OPT_DIR = 'scons/build/opt/gtest/scons' +GTEST_OTHER_DIR = 'scons/build/other/gtest/scons' def AddExeExtension(path): |