summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 13:24:46 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 13:24:46 +0000
commitc0ad791979458a895a7fd17a2a6fb920a7dd2756 (patch)
treeb66e94e95178ccfb19e49610a0aeb2b030bfe17d /base
parent25c715da81b42f62e1a7ece7b2ff1a73fbac507c (diff)
downloadchromium_src-c0ad791979458a895a7fd17a2a6fb920a7dd2756.zip
chromium_src-c0ad791979458a895a7fd17a2a6fb920a7dd2756.tar.gz
chromium_src-c0ad791979458a895a7fd17a2a6fb920a7dd2756.tar.bz2
Disable ProcMapsTest.ReadProcMaps under ThreadSanitizer until issue 258451 is fixed.
BUG=258451 R=mark@chromium.org CC=scherkus@chromium.org Review URL: https://codereview.chromium.org/18071005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/debug/proc_maps_linux_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/base/debug/proc_maps_linux_unittest.cc b/base/debug/proc_maps_linux_unittest.cc
index 6a043b8..9b7d7dc 100644
--- a/base/debug/proc_maps_linux_unittest.cc
+++ b/base/debug/proc_maps_linux_unittest.cc
@@ -180,7 +180,14 @@ TEST(ProcMapsTest, Permissions) {
}
}
-TEST(ProcMapsTest, ReadProcMaps) {
+// ProcMapsTest.ReadProcMaps fails under TSan on Linux,
+// see http://crbug.com/258451.
+#if defined(THREAD_SANITIZER)
+#define MAYBE_ReadProcMaps DISABLED_ReadProcMaps
+#else
+#define MAYBE_ReadProcMaps ReadProcMaps
+#endif
+TEST(ProcMapsTest, MAYBE_ReadProcMaps) {
std::string proc_maps;
ASSERT_TRUE(ReadProcMaps(&proc_maps));