summaryrefslogtreecommitdiffstats
path: root/chrome/chrome.gyp
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 23:01:34 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-27 23:01:34 +0000
commit4575021b2000963304a99b8cf6a4f0ba7afb88d3 (patch)
tree806a3445fdd4fe0876eb438ef1835252c955c496 /chrome/chrome.gyp
parent07dc5ffd9a5d10d55e2299651fe7a826d7fd7aba (diff)
downloadchromium_src-4575021b2000963304a99b8cf6a4f0ba7afb88d3.zip
chromium_src-4575021b2000963304a99b8cf6a4f0ba7afb88d3.tar.gz
chromium_src-4575021b2000963304a99b8cf6a4f0ba7afb88d3.tar.bz2
Revert r14620 which was a rollback of r14549 and r14508. This
change re-enables the ui tests. Since jam re-enabled some tests, I had to #ifdef around 4 tests that are not shutting down cleanly on linux. It looks like we have renderers that aren't shutting down properly (pegged at 100% cpu). Review URL: http://codereview.chromium.org/100061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
-rw-r--r--chrome/chrome.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5d2f6ed..67c4db3 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2149,6 +2149,7 @@
'browser/metrics/metrics_service_uitest.cc',
'browser/sessions/session_restore_uitest.cc',
'browser/tab_restore_uitest.cc',
+ 'browser/unload_uitest.cc',
'test/reliability/page_load_test.cc',
'test/ui/layout_plugin_uitest.cc',
'test/ui/omnibox_uitest.cc',
@@ -2174,7 +2175,6 @@
# TODO(port)? (Most of these include windows.h or similar.)
'browser/printing/printing_layout_uitest.cc',
'browser/ssl/ssl_uitest.cc',
- 'browser/unload_uitest.cc',
'browser/views/find_bar_win_uitest.cc',
'common/logging_chrome_uitest.cc',
'test/accessibility/accessibility_tests.cc',