aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-04 14:46:10 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-04 14:46:10 +0000
commitf22fe98cea6a4b9df4d3a6c8c665b9e6c07d260b (patch)
treef7be3cd9420a6de6677c88f1aed42f27232e6be2
parent513b7d817a9a219f3a8387d45d896931581b4361 (diff)
parenta0a0bee0ef473b1eee98ccc8150242a72f365ac4 (diff)
downloadlinux-kselftest-f22fe98cea6a4b9df4d3a6c8c665b9e6c07d260b.tar.gz
Snap for 10900817 from a0a0bee0ef473b1eee98ccc8150242a72f365ac4 to sdk-releaseplatform-tools-34.0.5
Change-Id: I42419597bde934502fb0d9186bb5f32821040b5f
-rw-r--r--Android.bp1
-rw-r--r--OWNERS1
-rw-r--r--tools/testing/selftests/seccomp/seccomp_bpf.c12
3 files changed, 13 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 5398c3976467..fc3f07680e82 100644
--- a/Android.bp
+++ b/Android.bp
@@ -441,6 +441,7 @@ cc_test {
cc_test {
name: "kselftest_net_tests",
relative_install_path: "linux-kselftest/net",
+ cflags: ["-Wno-gnu-variable-sized-type-not-at-end"],
srcs: [
"tools/testing/selftests/net/socket.c",
"tools/testing/selftests/net/psock_fanout.c",
diff --git a/OWNERS b/OWNERS
index 01a1d00e3a83..c0ae78e57f95 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,3 +1,4 @@
+# Bug component: 391836
drosen@google.com
edliaw@google.com
willmcvicker@google.com
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index fce11f729f36..f5aac9f66846 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -2175,6 +2175,9 @@ FIXTURE_TEARDOWN(TRACE_syscall)
TEST(negative_ENOSYS)
{
+#if defined(__arm__)
+ SKIP(return, "arm32 does not support calling syscall -1");
+#endif
/*
* There should be no difference between an "internal" skip
* and userspace asking for syscall "-1".
@@ -3079,7 +3082,8 @@ TEST(syscall_restart)
timeout.tv_sec = 1;
errno = 0;
EXPECT_EQ(0, nanosleep(&timeout, NULL)) {
- TH_LOG("Call to nanosleep() failed (errno %d)", errno);
+ TH_LOG("Call to nanosleep() failed (errno %d: %s)",
+ errno, strerror(errno));
}
/* Read final sync from parent. */
@@ -3987,6 +3991,9 @@ TEST(user_notification_filter_empty)
TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
}
+ if (__NR_clone3 < 0)
+ SKIP(return, "Test not built with clone3 support");
+
pid = sys_clone3(&args, sizeof(args));
ASSERT_GE(pid, 0);
@@ -4047,6 +4054,9 @@ TEST(user_notification_filter_empty_threaded)
TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!");
}
+ if (__NR_clone3 < 0)
+ SKIP(return, "Test not built with clone3 support");
+
pid = sys_clone3(&args, sizeof(args));
ASSERT_GE(pid, 0);