diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-11-13 02:54:23 (GMT) |
| commit | bcf926ec656688d7eb03159faaddbf56bd4ec8e2 (patch) | |
| tree | cec29bb0b412c73dd0d5c192e9f2357e70493f02 /test | |
| parent | 7e13e0f5dd2f9458e0a613e0a91c894eb80126fc (diff) | |
| download | googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.zip googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.gz googletest-bcf926ec656688d7eb03159faaddbf56bd4ec8e2.tar.bz2 | |
Improves the scons scripts and run_tests.py (by Vlad Losev); uses typed tests in gtest-port_test.cc only when typed tests are available (by Zhanyong Wan); makes gtest-param-util-generated.h conform to the C++ standard (by Zhanyong Wan).
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 df59f9e..0fbe5c5 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 79524a6..a9f0b5d 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): |