diff options
| author | kosak <kosak@google.com> | 2015-07-24 20:26:10 (GMT) |
|---|---|---|
| committer | kosak <kosak@google.com> | 2015-07-24 20:26:10 (GMT) |
| commit | 40bba6c9ec1a258ff450a99d7f6b8e8a1f9fee73 (patch) | |
| tree | c05659d80190f3fba3c1249ee6f1dfa6988ab09f | |
| parent | 01e229bacf8643eb47938e2ccf34372c7b177921 (diff) | |
| download | googletest-40bba6c9ec1a258ff450a99d7f6b8e8a1f9fee73.zip googletest-40bba6c9ec1a258ff450a99d7f6b8e8a1f9fee73.tar.gz googletest-40bba6c9ec1a258ff450a99d7f6b8e8a1f9fee73.tar.bz2 | |
Inject GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_
| -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. |