Enable futex tests on Android.

sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sandbox/linux/seccomp-bpf-helpers/baseline_policy.h"
 
 #include <errno.h>
 #include <linux/futex.h>
 #include <sched.h>
 #include <signal.h>
@@ skipping 10 matching lines @@
 
 #include "base/files/scoped_file.h"
 #include "base/macros.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
 #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
 #include "sandbox/linux/seccomp-bpf/bpf_tests.h"
 #include "sandbox/linux/seccomp-bpf/sandbox_bpf.h"
 #include "sandbox/linux/seccomp-bpf/syscall.h"
+#include "sandbox/linux/services/android_futex.h"
 #include "sandbox/linux/services/linux_syscalls.h"
 #include "sandbox/linux/services/thread_helpers.h"
 #include "sandbox/linux/tests/unit_tests.h"
 
 namespace sandbox {
 
 namespace {
 
 // |pid| is the return value of a fork()-like call. This
 // makes sure that if fork() succeeded the child exits
@@ skipping 208 matching lines @@
 TEST_BASELINE_SIGSYS(__NR_sysinfo);
 TEST_BASELINE_SIGSYS(__NR_syslog);
 TEST_BASELINE_SIGSYS(__NR_timer_create);
 
 #if !defined(__aarch64__)
 TEST_BASELINE_SIGSYS(__NR_eventfd);
 TEST_BASELINE_SIGSYS(__NR_inotify_init);
 TEST_BASELINE_SIGSYS(__NR_vserver);
 #endif
 
-#if !defined(OS_ANDROID)
 BPF_DEATH_TEST_C(BaselinePolicy,
                  FutexWithRequeuePriorityInheritence,
-                 DEATH_MESSAGE(GetFutexErrorMessageContentForTests()),
+                 DEATH_SEGV_MESSAGE(GetFutexErrorMessageContentForTests()),
                  BaselinePolicy) {
   syscall(__NR_futex, NULL, FUTEX_CMP_REQUEUE_PI, 0, NULL, NULL, 0);
   _exit(1);
 }
 
 BPF_DEATH_TEST_C(BaselinePolicy,
                  FutexWithRequeuePriorityInheritencePrivate,
-                 DEATH_MESSAGE(GetFutexErrorMessageContentForTests()),
+                 DEATH_SEGV_MESSAGE(GetFutexErrorMessageContentForTests()),
                  BaselinePolicy) {
   syscall(__NR_futex, NULL, FUTEX_CMP_REQUEUE_PI_PRIVATE, 0, NULL, NULL, 0);
   _exit(1);
 }
 
 BPF_DEATH_TEST_C(BaselinePolicy,
                  FutexWithUnlockPIPrivate,
-                 DEATH_MESSAGE(GetFutexErrorMessageContentForTests()),
+                 DEATH_SEGV_MESSAGE(GetFutexErrorMessageContentForTests()),
                  BaselinePolicy) {
   syscall(__NR_futex, NULL, FUTEX_UNLOCK_PI_PRIVATE, 0, NULL, NULL, 0);
   _exit(1);
 }
-#endif  // !defined(OS_ANDROID)
 
 BPF_TEST_C(BaselinePolicy, PrctlDumpable, BaselinePolicy) {
   const int is_dumpable = prctl(PR_GET_DUMPABLE, 0, 0, 0, 0);
   BPF_ASSERT(is_dumpable == 1 || is_dumpable == 0);
   const int prctl_ret = prctl(PR_SET_DUMPABLE, is_dumpable, 0, 0, 0, 0);
   BPF_ASSERT_EQ(0, prctl_ret);
 }
 
 // Workaround incomplete Android headers.
 #if !defined(PR_CAPBSET_READ)
@@ skipping 39 matching lines @@
                  GetPrioritySigsys,
                  DEATH_SEGV_MESSAGE(GetErrorMessageContentForTests()),
                  BaselinePolicy) {
   getpriority(PRIO_USER, 0);
   _exit(1);
 }
 
 }  // namespace
 
 }  // namespace sandbox