summaryrefslogtreecommitdiffstats
path: root/tools/valgrind
diff options
context:
space:
mode:
Diffstat (limited to 'tools/valgrind')
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest.txt4
-rw-r--r--tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt4
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
index 562cd80..2d6bcf4 100644
--- a/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest.txt
@@ -4,9 +4,11 @@ BrowserTest.ThirtyFourTabs
SessionRestoreUITest.*
# Buggy test; see http://crbug.com/6522
DownloadTest.UnknownSize
-# Flakily hang on Linux, see http://crbug.com/46643
+# Flakily hang on Linux, Mac. See http://crbug.com/46643 and
+# http://crbug.com/29598.
ErrorPageTest.DNSError_GoBack2AndForward
ErrorPageTest.DNSError_GoBack2Forward2
+ErrorPageTest.DNSError_GoBack1
ErrorPageTest.DNSError_GoBack2
# Flaky timeout on Linux; see http://crbug.com/46781
diff --git a/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
index 8e2b1fb..8e3cfa8d 100644
--- a/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
+++ b/tools/valgrind/gtest_exclude/ui_tests.gtest_mac.txt
@@ -28,10 +28,6 @@ ErrorPageTest.IFrameDNSError_GoBackAndForward
BrowserEncodingTest.TestEncodingAutoDetect
# See http://crbug.com/29598.
DOMStorageTest.LocalStorageLayoutTests
-ErrorPageTest.DNSError_GoBack1
-ErrorPageTest.DNSError_GoBack2
-ErrorPageTest.DNSError_GoBack2AndForward
-ErrorPageTest.DNSError_GoBack2Forward2
# See http://crbug.com/30367.
NewTabUITest.NTPHasThumbnails
NewTabUITest.UpdateUserPrefsVersion