diff options
| author | misterg <misterg@google.com> | 2019-01-03 17:39:44 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-01-03 21:40:20 (GMT) |
| commit | 3a460a26b7a91abf87af7f31b93d29f930e25c82 (patch) | |
| tree | 286a8c244c42d40f2117ccabe41eb3aff8132cdf /googletest/src/gtest-death-test.cc | |
| parent | ac8c102dae661b8bff6780ffdc535c6d1957d45b (diff) | |
| download | googletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.zip googletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.tar.gz googletest-3a460a26b7a91abf87af7f31b93d29f930e25c82.tar.bz2 | |
Googletest export
TestCase->TestSuite refactoring
PiperOrigin-RevId: 227702164
Diffstat (limited to 'googletest/src/gtest-death-test.cc')
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index ddc3453..9bdfdea 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -753,9 +753,9 @@ DeathTest::TestRole WindowsDeathTest::AssumeRole() { FALSE, // The initial state is non-signalled. nullptr)); // The even is unnamed. GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != nullptr); - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + - info->test_case_name() + "." + info->name(); + const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ + + kFilterFlag + "=" + info->test_suite_name() + + "." + info->name(); const std::string internal_flag = std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" + file_ + "|" + StreamableToString(line_) + "|" + @@ -972,9 +972,9 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { FlushInfoLog(); // Build the child process command line. - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); + const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ + + kFilterFlag + "=" + info->test_suite_name() + + "." + info->name(); const std::string internal_flag = std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" + file_ + "|" @@ -1411,9 +1411,9 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() { // it be closed when the child process does an exec: GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1); - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); + const std::string filter_flag = std::string("--") + GTEST_FLAG_PREFIX_ + + kFilterFlag + "=" + info->test_suite_name() + + "." + info->name(); const std::string internal_flag = std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" + file_ + "|" + StreamableToString(line_) + "|" |