summaryrefslogtreecommitdiffstats
path: root/sandbox/linux
diff options
context:
space:
mode:
authorjyasskin <jyasskin@chromium.org>2014-08-26 17:00:38 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-27 00:03:08 +0000
commit94faaf73f0f6a755adc60943f5556dee3201d764 (patch)
tree0b4fb7ffcf6c00970cfeea474049a2ad887f3623 /sandbox/linux
parent87267fed0d81366585191b2b9ad591f0cdc87d52 (diff)
downloadchromium_src-94faaf73f0f6a755adc60943f5556dee3201d764.zip
chromium_src-94faaf73f0f6a755adc60943f5556dee3201d764.tar.gz
chromium_src-94faaf73f0f6a755adc60943f5556dee3201d764.tar.bz2
Disable SandboxBPF.StartSingleThreadedAsMultiThreaded under TSan v2.
BUG=407357 TBR=rsesek@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/510473003 Cr-Commit-Position: refs/heads/master@{#292042}
Diffstat (limited to 'sandbox/linux')
-rw-r--r--sandbox/linux/seccomp-bpf/sandbox_bpf_unittest.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sandbox/linux/seccomp-bpf/sandbox_bpf_unittest.cc b/sandbox/linux/seccomp-bpf/sandbox_bpf_unittest.cc
index b8a36e6..0ce508b 100644
--- a/sandbox/linux/seccomp-bpf/sandbox_bpf_unittest.cc
+++ b/sandbox/linux/seccomp-bpf/sandbox_bpf_unittest.cc
@@ -2250,6 +2250,8 @@ SANDBOX_DEATH_TEST(SandboxBPF, StartMultiThreadedAsSingleThreaded,
BPF_ASSERT(!sandbox.StartSandbox(SandboxBPF::PROCESS_SINGLE_THREADED));
}
+// http://crbug.com/407357
+#if !defined(THREAD_SANITIZER)
SANDBOX_DEATH_TEST(SandboxBPF, StartSingleThreadedAsMultiThreaded,
DEATH_MESSAGE("Cannot start sandbox; process may be single-threaded when "
"reported as not")) {
@@ -2257,6 +2259,7 @@ SANDBOX_DEATH_TEST(SandboxBPF, StartSingleThreadedAsMultiThreaded,
sandbox.SetSandboxPolicy(new AllowAllPolicy());
BPF_ASSERT(!sandbox.StartSandbox(SandboxBPF::PROCESS_MULTI_THREADED));
}
+#endif // !defined(THREAD_SANITIZER)
} // namespace