From fe587c0cd8d15b8e0a492df49c824d9c44912aef Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Thu, 2 Apr 2020 13:57:50 -0600 Subject: tests: Also test ppc64le in test 36 This commit adds the ppc64le architecture to test 36-sim-ipc_syscalls. Signed-off-by: Tom Hromatka Acked-by: Paul Moore --- tests/36-sim-ipc_syscalls.c | 3 +++ tests/36-sim-ipc_syscalls.py | 1 + tests/36-sim-ipc_syscalls.tests | 50 ++++++++++++++++++++--------------------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/tests/36-sim-ipc_syscalls.c b/tests/36-sim-ipc_syscalls.c index c3ff332..1437e43 100644 --- a/tests/36-sim-ipc_syscalls.c +++ b/tests/36-sim-ipc_syscalls.c @@ -51,6 +51,9 @@ int main(int argc, char *argv[]) if (rc != 0) goto out; rc = seccomp_arch_add(ctx, SCMP_ARCH_X32); + if (rc != 0) + goto out; + rc = seccomp_arch_add(ctx, SCMP_ARCH_PPC64LE); if (rc != 0) goto out; diff --git a/tests/36-sim-ipc_syscalls.py b/tests/36-sim-ipc_syscalls.py index 369a80e..2e223ff 100755 --- a/tests/36-sim-ipc_syscalls.py +++ b/tests/36-sim-ipc_syscalls.py @@ -34,6 +34,7 @@ def test(args): f.add_arch(Arch("x86")) f.add_arch(Arch("x86_64")) f.add_arch(Arch("x32")) + f.add_arch(Arch("ppc64le")) f.add_rule(ALLOW, "semop") f.add_rule(ALLOW, "semtimedop") f.add_rule(ALLOW, "semget") diff --git a/tests/36-sim-ipc_syscalls.tests b/tests/36-sim-ipc_syscalls.tests index 8e0ded7..8d83af7 100644 --- a/tests/36-sim-ipc_syscalls.tests +++ b/tests/36-sim-ipc_syscalls.tests @@ -7,31 +7,31 @@ test type: bpf-sim -# Testname Arch Syscall Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Result -36-sim-ipc_syscalls +x86 ipc 1 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 2 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 3 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 4 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 11 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 12 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 13 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 14 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 21 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 22 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 23 N N N N N ALLOW -36-sim-ipc_syscalls +x86 ipc 24 N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 semop N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 semget N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 semctl N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 semtimedop N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 msgsnd N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 msgrcv N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 msgget N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 msgctl N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 shmat N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 shmdt N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 shmget N N N N N N ALLOW -36-sim-ipc_syscalls +x86_64 shmctl N N N N N N ALLOW +# Testname Arch Syscall Arg0 Arg1 Arg2 Arg3 Arg4 Arg5 Result +36-sim-ipc_syscalls +x86,+ppc64le ipc 1 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 2 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 3 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 4 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 11 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 12 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 13 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 14 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 21 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 22 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 23 N N N N N ALLOW +36-sim-ipc_syscalls +x86,+ppc64le ipc 24 N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 semop N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 semget N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 semctl N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 semtimedop N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 msgsnd N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 msgrcv N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 msgget N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 msgctl N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 shmat N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 shmdt N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 shmget N N N N N N ALLOW +36-sim-ipc_syscalls +x86_64 shmctl N N N N N N ALLOW test type: bpf-valgrind -- cgit v1.2.1