summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 20:23:38 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-01 20:23:38 +0000
commit3f94a9eedbb0bd352beeea9ae65591c69c9012f1 (patch)
tree02e84ef16c3f123ef6862e97494d6694b356bbd4
parent757b830b69910baf5942814c5107878a2e2e5392 (diff)
downloadchromium_src-3f94a9eedbb0bd352beeea9ae65591c69c9012f1.zip
chromium_src-3f94a9eedbb0bd352beeea9ae65591c69c9012f1.tar.gz
chromium_src-3f94a9eedbb0bd352beeea9ae65591c69c9012f1.tar.bz2
Only disable UnloadTest.BrowserCloseTabWhenOtherTabHasListener under valgrind
(leave it enabled on non-valgrind Linux) BUG=45562 TEST=green tree Review URL: http://codereview.chromium.org/2428002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48649 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/unload_uitest.cc4
-rw-r--r--chrome/test/data/valgrind/ui_tests.gtest_linux.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 9337251..b6e6a09 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -406,10 +406,8 @@ TEST_F(UnloadTest, BrowserCloseTwoSecondBeforeUnloadAlert) {
#define MAYBE_BrowserCloseTabWhenOtherTabHasListener \
DISABLED_BrowserCloseTabWhenOtherTabHasListener
#else
-// http://crbug.com/45562
-// (whoa momma! That's all of them!)
#define MAYBE_BrowserCloseTabWhenOtherTabHasListener \
- DISABLED_BrowserCloseTabWhenOtherTabHasListener
+ BrowserCloseTabWhenOtherTabHasListener
#endif
// Tests that if there's a renderer process with two tabs, one of which has an
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
index fbb126a..1ffd492 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest_linux.txt
@@ -11,3 +11,5 @@ ExtensionProxyUITest.*
BrowserTest.FLAKY_PosixSessionEnd
# See http://crbug.com/42921
ResourceDispatcherTest.CrossSiteAfterCrash
+# See http://crbug.com/45562
+UnloadTest.BrowserCloseTabWhenOtherTabHasListener