Adds ability to inject death test child arguments for test purposes.

git-svn-id: http://googletest.googlecode.com/svn/trunk@599 861a406c-534a-0410-8894-cb66d6ee9925

1 files changed, 6 insertions, 1 deletions

diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc
index 2f0b0e3..76aa168 100644
--- a/src/gtest-death-test.cc
+++ b/src/gtest-death-test.cc
@@ -844,6 +844,11 @@ class ExecDeathTest : public ForkingDeathTest {
       ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { }
   virtual TestRole AssumeRole();
  private:
+  static ::std::vector<testing::internal::string>
+  GetArgvsForDeathTestChildProcess() {
+    ::std::vector<testing::internal::string> args = GetInjectableArgvs();
+    return args;
+  }
   // The name of the file in which the death test is located.
   const char* const file_;
   // The line number on which the death test is located.
@@ -1082,7 +1087,7 @@ DeathTest::TestRole ExecDeathTest::AssumeRole() {
                      GTEST_FLAG_PREFIX_, kInternalRunDeathTestFlag,
                      file_, line_, death_test_index, pipe_fd[1]);
   Arguments args;
-  args.AddArguments(GetArgvs());
+  args.AddArguments(GetArgvsForDeathTestChildProcess());
   args.AddArgument(filter_flag.c_str());
   args.AddArgument(internal_flag.c_str());