summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 23:10:55 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-16 23:10:55 +0000
commit31b19b4f3beedf1a641c6961f3cac78e08d456e7 (patch)
tree22a40353ecdf3a368ac6a3d326d11b959fc8fff3 /tools
parent55fcc4639a31d535e438220e74ad1a32d8d51911 (diff)
downloadchromium_src-31b19b4f3beedf1a641c6961f3cac78e08d456e7.zip
chromium_src-31b19b4f3beedf1a641c6961f3cac78e08d456e7.tar.gz
chromium_src-31b19b4f3beedf1a641c6961f3cac78e08d456e7.tar.bz2
Heapcheck Linux / TSAN win32: Disable TraceEventTestFixture.TraceContinuousSampling.
BUG=308273 NOTRY=true R=haraken@chromium.org TBR=haraken@chromium.org Review URL: https://codereview.chromium.org/27606002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/heapcheck/base_unittests.gtest-heapcheck.txt3
-rw-r--r--tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/tools/heapcheck/base_unittests.gtest-heapcheck.txt b/tools/heapcheck/base_unittests.gtest-heapcheck.txt
index 00589f8..a3c0f00 100644
--- a/tools/heapcheck/base_unittests.gtest-heapcheck.txt
+++ b/tools/heapcheck/base_unittests.gtest-heapcheck.txt
@@ -1,3 +1,6 @@
# Failing after Lucid migration. http://crbug.com/82715
ProcessUtilTest.GetTerminationStatusExit
SharedMemoryProcessTest.Tasks
+
+# Occasionally times out. http://crbug.com/308273
+TraceEventTestFixture.TraceContinuousSampling
diff --git a/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt
index c9d4077..adecabc 100644
--- a/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest-tsan_win32.txt
@@ -21,3 +21,6 @@ WorkerPoolTest.PostTask
# Times out on Win7, slow on Vista: http://crbug.com/106531
TraceEventTestFixture.DataCapturedManyThreads
+
+# Fails and times out occasionally. http://crbug.com/308273
+TraceEventTestFixture.TraceContinuousSampling