aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTri Vo <trong@google.com>2017-03-23 16:17:40 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-23 16:17:40 +0000
commit4cd19fa21c1db5bb599c37fa3dabeece9750e81f (patch)
treed1e4a98a5567052a3000c24fe2e090e255cc51c6
parentc1617505d9888d458a671942f4ef7f5db35c4a73 (diff)
parentd83fe5379d993b0c8a1fe9d385ca740391a1781f (diff)
downloadlinux-kselftest-oreo-dr1-dev.tar.gz
am: d83fe5379d Change-Id: I54704ab1e008fef00612de1863d01352fd58e14f
-rw-r--r--tools/testing/selftests/seccomp/seccomp_bpf.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 1c3cd253249f..03f1fa495d74 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -595,7 +595,6 @@ TEST(ERRNO_zero)
EXPECT_EQ(0, read(0, NULL, 0));
}
-#ifndef __ANDROID__
TEST(ERRNO_capped)
{
struct sock_filter filter[] = {
@@ -622,7 +621,6 @@ TEST(ERRNO_capped)
EXPECT_EQ(-1, read(0, NULL, 0));
EXPECT_EQ(4095, errno);
}
-#endif
FIXTURE_DATA(TRAP) {
struct sock_fprog prog;
@@ -1532,7 +1530,6 @@ TEST_F(TRACE_syscall, syscall_dropped)
EXPECT_NE(self->mytid, syscall(__NR_gettid));
}
-#ifndef __ANDROID__
TEST_F(TRACE_syscall, skip_after_RET_TRACE)
{
struct sock_filter filter[] = {
@@ -1656,7 +1653,6 @@ TEST_F_SIGNAL(TRACE_syscall, kill_after_ptrace, SIGSYS)
/* Tracer will redirect getpid to getppid, and we should die. */
EXPECT_NE(self->mypid, syscall(__NR_getpid));
}
-#endif
#ifndef __NR_seccomp
# if defined(__i386__)
@@ -2239,7 +2235,6 @@ TEST_F(TSYNC, two_siblings_not_under_filter)
ASSERT_EQ(0, ret); /* just us chickens */
}
-#ifndef __ANDROID__
/* Make sure restarted syscalls are seen directly as "restart_syscall". */
TEST(syscall_restart)
{
@@ -2408,7 +2403,6 @@ TEST(syscall_restart)
if (WIFSIGNALED(status) || WEXITSTATUS(status))
_metadata->passed = 0;
}
-#endif
/*
* TODO: