summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 14:07:52 +0000
committertimurrrr@chromium.org <timurrrr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-02 14:07:52 +0000
commit88b420a72a008e9a57cb9c41e3d036b6a664c240 (patch)
tree03f8dde3feb1db3faa8df7848cc13e51e5e27862
parentc1586fc13943b564af8c29889300c93653a3007f (diff)
downloadchromium_src-88b420a72a008e9a57cb9c41e3d036b6a664c240.zip
chromium_src-88b420a72a008e9a57cb9c41e3d036b6a664c240.tar.gz
chromium_src-88b420a72a008e9a57cb9c41e3d036b6a664c240.tar.bz2
Don't run WorkerTest.LimitTotal under Valgrind
The test hangs and/or crashes with both Valgrind tools we use. BUG=25917,22608 Review URL: http://codereview.chromium.org/351006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30697 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/valgrind/ui_tests.gtest-tsan.txt3
-rw-r--r--chrome/test/data/valgrind/ui_tests.gtest.txt4
-rw-r--r--chrome/test/data/valgrind/ui_tests.gtest_mac.txt2
3 files changed, 4 insertions, 5 deletions
diff --git a/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt b/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt
index 129eebf..1694b82 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest-tsan.txt
@@ -1,6 +1,3 @@
-# This test hangs under ThreadSanitizer, see http://crbug.com/25917
-WorkerTest.LimitTotal
-
# The reference builds give numerous reports under ThreadSanitizer
# TODO(timurrrr): do we need to run ReferenceTests under Valgrind at all?
DromaeoReferenceTest.Perf
diff --git a/chrome/test/data/valgrind/ui_tests.gtest.txt b/chrome/test/data/valgrind/ui_tests.gtest.txt
index f5b1eaf..09a999f 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest.txt
@@ -13,3 +13,7 @@ ErrorPageTest.DNSError_GoBack2AndForward
# Flaky timeout on Linux; see http://crbug.com/22927
UnloadTest.BrowserCloseInfiniteBeforeUnload
UnloadTest.BrowserCloseInfiniteBeforeUnloadAlert
+
+# This test hangs under Valgrind;
+# See http://crbug.com/25917 and http://crbug.com/22608
+WorkerTest.LimitTotal
diff --git a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
index 852cedd..03a6a306 100644
--- a/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
+++ b/chrome/test/data/valgrind/ui_tests.gtest_mac.txt
@@ -23,7 +23,5 @@ DownloadTest.IncognitoDownload
DownloadTest.NoDownload
DownloadTest.PerWindowShelf
ErrorPageTest.IFrameDNSError_GoBackAndForward
-# Hangs or fails on mac valgrind bot; http://crbug.com/22608
-WorkerTest.LimitTotal
# Kills valgrind stack traces: http://crbug.com/25589
DromaeoReferenceTest.Perf