Index: base/test/test_launcher.cc |
diff --git a/base/test/test_launcher.cc b/base/test/test_launcher.cc |
index 0da8cec21cc1becda1969c9482ae3768448da666..f33a3e306b17632ed5ec6b54a67f303e51d08e1f 100644 |
--- a/base/test/test_launcher.cc |
+++ b/base/test/test_launcher.cc |
@@ -350,6 +350,7 @@ TestLauncherDelegate::~TestLauncherDelegate() { |
} |
int LaunchChildGTestProcess(const CommandLine& command_line, |
+ const std::string& wrapper, |
zhaoqin
2013/06/26 19:03:28
shall we add comment somewhere to indicate why we
Paweł Hajdan Jr.
2013/06/26 19:59:49
Done.
|
base::TimeDelta timeout, |
bool* was_timeout) { |
CommandLine new_command_line(command_line.GetProgram()); |
@@ -367,6 +368,12 @@ int LaunchChildGTestProcess(const CommandLine& command_line, |
new_command_line.AppendSwitchNative((*iter).first, (*iter).second); |
} |
+#if defined(OS_WIN) |
+ new_command_line.PrependWrapper(ASCIIToWide(wrapper)); |
zhaoqin
2013/06/26 19:03:28
src\base\test\test_launcher.cc(372) : error C3861:
Paweł Hajdan Jr.
2013/06/26 19:59:49
Done.
|
+#elif defined(OS_POSIX) |
+ new_command_line.PrependWrapper(wrapper); |
+#endif |
+ |
zhaoqin
2013/06/26 19:03:28
shall we move the VLOG here too?
Paweł Hajdan Jr.
2013/06/26 19:59:49
IMHO not worth it. I'm happy to change though if a
|
base::ProcessHandle process_handle; |
base::LaunchOptions options; |