diff options
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 11 | ||||
| -rw-r--r-- | chrome/test/test_launcher/out_of_proc_test_runner.cc | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index c43d244..7f0838c 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -25,7 +25,6 @@ 'include_dirs': [ '<(DEPTH)', ], - # TODO(phajdan.jr): Only temporary, to make transition easier. 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], 'sources': [ '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc', @@ -41,6 +40,12 @@ '<(DEPTH)/chrome/test/interactive_ui/npapi_interactive_test.cc', '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.cc', '<(DEPTH)/chrome/test/interactive_ui/view_event_test_base.h', + # TODO(jcampan): we should use in_proc_test_runner on Windows. + '<(DEPTH)/chrome/test/test_launcher/out_of_proc_test_runner.cc', + '<(DEPTH)/chrome/test/test_launcher/test_runner.cc', + '<(DEPTH)/chrome/test/test_launcher/test_runner.h', + '<(DEPTH)/chrome/test/test_launcher/run_all_unittests.cc', + '<(DEPTH)/chrome/test/unit/chrome_test_suite.h', ], 'conditions': [ ['OS=="linux"', { @@ -49,10 +54,6 @@ '<(DEPTH)/tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', ], 'sources!': [ - # TODO(jcampan) - Re-enable failing browsertests on linux: (crbug.com/26540). - '<(DEPTH)/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc', - '<(DEPTH)/chrome/browser/browser_focus_uitest.cc', - '<(DEPTH)/chrome/browser/debugger/devtools_sanity_unittest.cc', # TODO(port) '<(DEPTH)/chrome/browser/views/bookmark_bar_view_test.cc', '<(DEPTH)/chrome/browser/views/find_bar_host_interactive_uitest.cc', 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"); |