eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inject GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_

Browse Source
This commit is contained in:
kosak 2015-07-24 20:26:10 +00:00
parent 01e229bacf
commit 40bba6c9ec
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtest-death-test.cc
View File

@ -33,6 +33,7 @@
#include "gtest/gtest-death-test.h" #include "gtest/gtest-death-test.h"
#include "gtest/internal/gtest-port.h" #include "gtest/internal/gtest-port.h"
#include "gtest/internal/custom/gtest.h"
#if GTEST_HAS_DEATH_TEST #if GTEST_HAS_DEATH_TEST
@ -883,6 +884,11 @@ class ExecDeathTest : public ForkingDeathTest {
static ::std::vector<testing::internal::string> static ::std::vector<testing::internal::string>
GetArgvsForDeathTestChildProcess() { GetArgvsForDeathTestChildProcess() {
::std::vector<testing::internal::string> args = GetInjectableArgvs(); ::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; return args;
} }
// The name of the file in which the death test is located. // The name of the file in which the death test is located.