summaryrefslogtreecommitdiffstats
path: root/chrome/test/test_launcher
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 23:10:26 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-03 23:10:26 +0000
commit819c9c270122b9d37498dd3f77d779b0cb5346e2 (patch)
tree947aeef3cf22384f6ccc01aadbc19257560e9315 /chrome/test/test_launcher
parent793618a51b1580b7d6625f450d67f2617c5ddd5e (diff)
downloadchromium_src-819c9c270122b9d37498dd3f77d779b0cb5346e2.zip
chromium_src-819c9c270122b9d37498dd3f77d779b0cb5346e2.tar.gz
chromium_src-819c9c270122b9d37498dd3f77d779b0cb5346e2.tar.bz2
Making the interactive ui tests run out of process to avoid running
into problems when running several browser tests in the same process. Turning previously failing tests on. BUG=26540 TEST=Run the interactive UI tests on Windows and Linux. Review URL: http://codereview.chromium.org/355014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/test_launcher')
-rw-r--r--chrome/test/test_launcher/out_of_proc_test_runner.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/test/test_launcher/out_of_proc_test_runner.cc b/chrome/test/test_launcher/out_of_proc_test_runner.cc
index dd1f5af..e6f861b 100644
--- a/chrome/test/test_launcher/out_of_proc_test_runner.cc
+++ b/chrome/test/test_launcher/out_of_proc_test_runner.cc
@@ -33,7 +33,12 @@ class OutOfProcTestRunner : public tests::TestRunner {
// Returns true if the test succeeded, false if it failed.
bool RunTest(const std::string& test_name) {
const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+#if defined(OS_WIN)
+ CommandLine new_cmd_line =
+ CommandLine::FromString(cmd_line->command_line_string());
+#else
CommandLine new_cmd_line(cmd_line->argv());
+#endif
// Always enable disabled tests. This method is not called with disabled
// tests unless this flag was specified to the browser test executable.
new_cmd_line.AppendSwitch("gtest_also_run_disabled_tests");