diff options
author | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-24 20:26:10 +0000 |
---|---|---|
committer | kosak@google.com <kosak@google.com@861a406c-534a-0410-8894-cb66d6ee9925> | 2015-07-24 20:26:10 +0000 |
commit | 32bf248084e2a78081921dc336083df13319986d (patch) | |
tree | c05659d80190f3fba3c1249ee6f1dfa6988ab09f /src | |
parent | 5b7905cd4e67b6702dfe47b5f78cb69f0338e31a (diff) | |
download | googletest-32bf248084e2a78081921dc336083df13319986d.tar.gz |
Inject GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_
git-svn-id: http://googletest.googlecode.com/svn/trunk@737 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'src')
-rw-r--r-- | src/gtest-death-test.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc index a614407..c076d07 100644 --- a/src/gtest-death-test.cc +++ b/src/gtest-death-test.cc @@ -33,6 +33,7 @@ #include "gtest/gtest-death-test.h" #include "gtest/internal/gtest-port.h" +#include "gtest/internal/custom/gtest.h" #if GTEST_HAS_DEATH_TEST @@ -883,6 +884,11 @@ class ExecDeathTest : public ForkingDeathTest { static ::std::vector<testing::internal::string> GetArgvsForDeathTestChildProcess() { ::std::vector<testing::internal::string> args = GetInjectableArgvs(); +# if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) + ::std::vector<testing::internal::string> extra_args = + GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_(); + args.insert(args.end(), extra_args.begin(), extra_args.end()); +# endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) return args; } // The name of the file in which the death test is located. |