1Disable further incompatible seccomp subtests. 2 3Bug: 147676645 4 5--- a/tools/testing/selftests/seccomp/seccomp_bpf.c 6+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c 7@@ -13,12 +13,14 @@ 8 * we need to use the kernel's siginfo.h file and trick glibc 9 * into accepting it. 10 */ 11+#if defined(__GLIBC_PREREQ) 12 #if !__GLIBC_PREREQ(2, 26) 13 # include <asm/siginfo.h> 14 # define __have_siginfo_t 1 15 # define __have_sigval_t 1 16 # define __have_sigevent_t 1 17 #endif 18+#endif 19 20 #include <errno.h> 21 #include <linux/filter.h> 22@@ -475,6 +477,8 @@ 23 EXPECT_EQ(EINVAL, errno); 24 } 25 26+/* b/147676645 */ 27+#if 0 28 TEST(log_all) 29 { 30 struct sock_filter filter[] = { 31@@ -496,6 +500,7 @@ 32 /* getppid() should succeed and be logged (no check for logging) */ 33 EXPECT_EQ(parent, syscall(__NR_getppid)); 34 } 35+#endif 36 37 TEST_SIGNAL(unknown_ret_is_kill_inside, SIGSYS) 38 { 39@@ -748,6 +753,8 @@ 40 exit(42); 41 } 42 43+/* b/147676645 */ 44+#if 0 45 TEST(KILL_thread) 46 { 47 int status; 48@@ -766,6 +773,7 @@ 49 ASSERT_TRUE(WIFEXITED(status)); 50 ASSERT_EQ(42, WEXITSTATUS(status)); 51 } 52+#endif 53 54 TEST(KILL_process) 55 { 56@@ -1313,6 +1321,8 @@ 57 EXPECT_EQ(-1, syscall(__NR_getpid)); 58 } 59 60+/* b/147676645 */ 61+#if 0 62 TEST_F(precedence, log_is_fifth) 63 { 64 pid_t mypid, parent; 65@@ -1352,6 +1362,7 @@ 66 /* Should also work just fine */ 67 EXPECT_EQ(mypid, syscall(__NR_getpid)); 68 } 69+#endif 70 71 #ifndef PTRACE_O_TRACESECCOMP 72 #define PTRACE_O_TRACESECCOMP 0x00000080 73@@ -1871,6 +1882,8 @@ 74 free(self->prog.filter); 75 } 76 77+/* b/147676645 */ 78+#if 0 79 TEST_F(TRACE_syscall, ptrace_syscall_redirected) 80 { 81 /* Swap SECCOMP_RET_TRACE tracer for PTRACE_SYSCALL tracer. */ 82@@ -1903,6 +1916,7 @@ 83 /* Tracer should skip the gettid syscall, resulting fake pid. */ 84 EXPECT_SYSCALL_RETURN(45000, syscall(__NR_gettid)); 85 } 86+#endif 87 88 TEST_F(TRACE_syscall, syscall_allowed) 89 { 90@@ -2181,6 +2195,8 @@ 91 } 92 } 93 94+/* b/147676645 */ 95+#if 0 96 /* 97 * Test detection of known and unknown filter flags. Userspace needs to be able 98 * to check if a filter flag is supported by the current kernel and a good way 99@@ -2270,6 +2286,7 @@ 100 flag); 101 } 102 } 103+#endif 104 105 TEST(TSYNC_first) 106 { 107@@ -2916,6 +2933,8 @@ 108 _metadata->passed = 0; 109 } 110 111+/* b/147676645 */ 112+#if 0 113 TEST_SIGNAL(filter_flag_log, SIGSYS) 114 { 115 struct sock_filter allow_filter[] = { 116@@ -3077,7 +3096,10 @@ 117 skip: 118 ASSERT_EQ(0, kill(pid, SIGKILL)); 119 } 120+#endif 121 122+/* b/147676645 */ 123+#if 0 124 static int user_trap_syscall(int nr, unsigned int flags) 125 { 126 struct sock_filter filter[] = { 127@@ -3618,6 +3640,7 @@ 128 } 129 } 130 } 131+#endif 132 133 /* 134 * TODO: 135