From 5abc3b1284faa7e3e63b6efed5300572ac0723ce Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Mon, 23 Mar 2020 13:15:46 -0600 Subject: tests: Remove ipc syscalls from test 53-sim-binary_tree The syscalls shmat, shmctl, and shmget are ipc syscalls on s390 and s390x. This causes test #53 to fail due to the syscall number not matching up with the values in the *.tests file. This commit removes the aforementioned ipc syscalls since they are being tested in tests #36 and #37. Signed-off-by: Tom Hromatka Signed-off-by: Paul Moore --- tests/53-sim-binary_tree.c | 3 --- tests/53-sim-binary_tree.py | 3 --- tests/53-sim-binary_tree.tests | 3 --- 3 files changed, 9 deletions(-) diff --git a/tests/53-sim-binary_tree.c b/tests/53-sim-binary_tree.c index bf2e553..291b7c5 100644 --- a/tests/53-sim-binary_tree.c +++ b/tests/53-sim-binary_tree.c @@ -72,9 +72,6 @@ struct syscall_errno table[] = { { SCMP_SYS(msync), 26, 0, { 0, 0 } }, { SCMP_SYS(mincore), 27, 0, { 0, 0 } }, { SCMP_SYS(madvise), 28, 0, { 0, 0 } }, - { SCMP_SYS(shmget), 29, 0, { 0, 0 } }, - { SCMP_SYS(shmat), 30, 1, { 110, 0 } }, - { SCMP_SYS(shmctl), 31, 1, { 111, 0 } }, { SCMP_SYS(dup), 32, 1, { 112, 0 } }, { SCMP_SYS(dup2), 33, 0, { 0, 0 } }, { SCMP_SYS(pause), 34, 0, { 0, 0 } }, diff --git a/tests/53-sim-binary_tree.py b/tests/53-sim-binary_tree.py index 0d3a77f..9798c0b 100755 --- a/tests/53-sim-binary_tree.py +++ b/tests/53-sim-binary_tree.py @@ -58,9 +58,6 @@ table = [ {"syscall": "msync", "error": 26, "arg_cnt": 0 }, {"syscall": "mincore", "error": 27, "arg_cnt": 0 }, {"syscall": "madvise", "error": 28, "arg_cnt": 0 }, - {"syscall": "shmget", "error": 29, "arg_cnt": 0 }, - {"syscall": "shmat", "error": 30, "arg_cnt": 1, "arg1": 110 }, - {"syscall": "shmctl", "error": 31, "arg_cnt": 1, "arg1": 111 }, {"syscall": "dup", "error": 32, "arg_cnt": 1, "arg1": 112 }, {"syscall": "dup2", "error": 33, "arg_cnt": 0 }, {"syscall": "pause", "error": 34, "arg_cnt": 0 }, diff --git a/tests/53-sim-binary_tree.tests b/tests/53-sim-binary_tree.tests index 240c4db..7dd585c 100644 --- a/tests/53-sim-binary_tree.tests +++ b/tests/53-sim-binary_tree.tests @@ -41,9 +41,6 @@ test type: bpf-sim 53-sim-binary_tree all msync N N N N N N ERRNO(26) 53-sim-binary_tree all mincore N N N N N N ERRNO(27) 53-sim-binary_tree all madvise N N N N N N ERRNO(28) -53-sim-binary_tree all shmget N N N N N N ERRNO(29) -53-sim-binary_tree all shmat 110 N N N N N ERRNO(30) -53-sim-binary_tree all shmctl 111 N N N N N ERRNO(31) 53-sim-binary_tree all dup 112 N N N N N ERRNO(32) 53-sim-binary_tree all dup 5678 N N N N N ALLOW 53-sim-binary_tree all dup2 N N N N N N ERRNO(33) -- cgit v1.2.1