summaryrefslogtreecommitdiffstats
path: root/tools/valgrind
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 23:32:37 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 23:32:37 +0000
commit0aea3183c8a6e08e211969d7883e368a0815b6d5 (patch)
tree9a3306a8b82bb99cbc3f0b592363864474781dcb /tools/valgrind
parentb3e7c9eb822a04710cd12430866bde6df8e3a15d (diff)
downloadchromium_src-0aea3183c8a6e08e211969d7883e368a0815b6d5.zip
chromium_src-0aea3183c8a6e08e211969d7883e368a0815b6d5.tar.gz
chromium_src-0aea3183c8a6e08e211969d7883e368a0815b6d5.tar.bz2
Valgrind: Consolidate test exclusions and add an exclusion for DNSError_GoBack1
which is now hanging on Linux as well. BUG=29598,46643 TEST=none TBR=thestig Review URL: http://codereview.chromium.org/6921004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84007 0039d316-1c4b-4281-b951-d872f2087c98
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