merge in oc-release history after reset to master
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 1c3cd25..03f1fa4 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -595,7 +595,6 @@
EXPECT_EQ(0, read(0, NULL, 0));
}
-#ifndef __ANDROID__
TEST(ERRNO_capped)
{
struct sock_filter filter[] = {
@@ -622,7 +621,6 @@
EXPECT_EQ(-1, read(0, NULL, 0));
EXPECT_EQ(4095, errno);
}
-#endif
FIXTURE_DATA(TRAP) {
struct sock_fprog prog;
@@ -1532,7 +1530,6 @@
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 @@
/* 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 @@
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 @@
if (WIFSIGNALED(status) || WEXITSTATUS(status))
_metadata->passed = 0;
}
-#endif
/*
* TODO:
