From 40bba6c9ec1a258ff450a99d7f6b8e8a1f9fee73 Mon Sep 17 00:00:00 2001
From: kosak <kosak@google.com>
Date: Fri, 24 Jul 2015 20:26:10 +0000
Subject: [PATCH] Inject GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_

---
 src/gtest-death-test.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gtest-death-test.cc b/src/gtest-death-test.cc
index a6144074..c076d072 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.