diff options
| author | hans <hans@chromium.org> | 2015-02-28 16:55:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-01 00:55:53 +0000 |
| commit | b8be3a268134f32d667b42ea60a27c0084063873 (patch) | |
| tree | f7e5478b0efcaff079ba8efce1d352d250c4787a /sandbox/linux | |
| parent | 0612babb1b1ed350979e2ef3d8c099b36021c744 (diff) | |
| download | chromium_src-b8be3a268134f32d667b42ea60a27c0084063873.zip chromium_src-b8be3a268134f32d667b42ea60a27c0084063873.tar.gz chromium_src-b8be3a268134f32d667b42ea60a27c0084063873.tar.bz2 | |
Roll Clang 223108:230631 (+revert of r229678)
Also introduce a build number in the package name, stop versioning
the Blink GC plugin, and remove repackage.sh.
BUG=444089
TBR=jln, jbauman
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/959443002
Cr-Commit-Position: refs/heads/master@{#318610}
Diffstat (limited to 'sandbox/linux')
| -rw-r--r-- | sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc index 2d337c6..8e7e144 100644 --- a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc +++ b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc @@ -651,6 +651,10 @@ ResultExpr RedirectAllSyscallsPolicy::EvaluateSyscall(int sysno) const { return UnsafeTrap(AllowRedirectedSyscall, NULL); } +#if !defined(ADDRESS_SANITIZER) +// ASan does not allow changing the signal handler for SIGBUS, and treats it as +// a fatal signal. + int bus_handler_fd_ = -1; void SigBusHandler(int, siginfo_t* info, void* void_context) { @@ -679,6 +683,7 @@ BPF_TEST_C(SandboxBPF, SigBus, RedirectAllSyscallsPolicy) { BPF_ASSERT(close(fds[1]) == 0); BPF_ASSERT(c == 0x55); } +#endif // !defined(ADDRESS_SANITIZER) BPF_TEST_C(SandboxBPF, SigMask, RedirectAllSyscallsPolicy) { // Signal masks are potentially tricky to handle. For instance, if we |