| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/process/launch.h" | 6 #include "base/process/launch.h" |
| 7 #include "base/test/launcher/test_launcher.h" | 7 #include "base/test/launcher/test_launcher.h" |
| 8 #include "base/test/test_switches.h" | 8 #include "base/test/test_switches.h" |
| 9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
| 10 #include "chrome/browser/ui/test/test_browser_dialog.h" | 10 #include "chrome/browser/ui/test/test_browser_dialog.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 base::LaunchOptions options; | 60 base::LaunchOptions options; |
| 61 | 61 |
| 62 // Disable timeouts and generate screen output if --interactive was specified. | 62 // Disable timeouts and generate screen output if --interactive was specified. |
| 63 if (command.HasSwitch(internal::kInteractiveSwitch)) { | 63 if (command.HasSwitch(internal::kInteractiveSwitch)) { |
| 64 command.AppendSwitchASCII(switches::kUiTestActionMaxTimeout, | 64 command.AppendSwitchASCII(switches::kUiTestActionMaxTimeout, |
| 65 TestTimeouts::kNoTimeoutSwitchValue); | 65 TestTimeouts::kNoTimeoutSwitchValue); |
| 66 command.AppendSwitchASCII(switches::kTestLauncherTimeout, | 66 command.AppendSwitchASCII(switches::kTestLauncherTimeout, |
| 67 TestTimeouts::kNoTimeoutSwitchValue); | 67 TestTimeouts::kNoTimeoutSwitchValue); |
| 68 command.AppendSwitch(switches::kEnablePixelOutputInTests); | 68 command.AppendSwitch(switches::kEnablePixelOutputInTests); |
| 69 #if defined(OS_WIN) |
| 70 // Required to allow the new process to spawn. |
| 71 options.wait = true; |
| 72 #endif |
| 69 } else { | 73 } else { |
| 70 options.wait = true; | 74 options.wait = true; |
| 71 } | 75 } |
| 72 | 76 |
| 73 base::LaunchProcess(command, options); | 77 base::LaunchProcess(command, options); |
| 74 } | 78 } |
| OLD | NEW |