diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:15:22 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 00:15:22 +0000 |
| commit | ad464a2dbe69ed57ea146e3b6a9eb9451ff161ae (patch) | |
| tree | ee435ec560c616ddc70c28dacd63b30f22be293c /chrome/test/interactive_ui | |
| parent | 28020a114bbf0263ec85f27e7f39b50533ca282d (diff) | |
| download | chromium_src-ad464a2dbe69ed57ea146e3b6a9eb9451ff161ae.zip chromium_src-ad464a2dbe69ed57ea146e3b6a9eb9451ff161ae.tar.gz chromium_src-ad464a2dbe69ed57ea146e3b6a9eb9451ff161ae.tar.bz2 | |
Reverting 30879.
Some devtool tests hang on Windows, one fails on Linux.
I need to investigate more.
BUG=None
TBR=rafael
Review URL: http://codereview.chromium.org/348067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30897 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 7f0838c..c43d244 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -25,6 +25,7 @@ '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', @@ -40,12 +41,6 @@ '<(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"', { @@ -54,6 +49,10 @@ '<(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', |