Commit 1ae81d78 authored by Kees Cook's avatar Kees Cook Committed by Shuah Khan

selftests/seccomp: Adjust test fixture counts

The seccomp selftest reported the wrong test counts since it was using
slightly the wrong API for defining text fixtures. Adjust the API usage.
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 9c249ec3
...@@ -909,7 +909,7 @@ TEST(ERRNO_order) ...@@ -909,7 +909,7 @@ TEST(ERRNO_order)
EXPECT_EQ(12, errno); EXPECT_EQ(12, errno);
} }
FIXTURE_DATA(TRAP) { FIXTURE(TRAP) {
struct sock_fprog prog; struct sock_fprog prog;
}; };
...@@ -1020,7 +1020,7 @@ TEST_F(TRAP, handler) ...@@ -1020,7 +1020,7 @@ TEST_F(TRAP, handler)
EXPECT_NE(0, (unsigned long)sigsys->_call_addr); EXPECT_NE(0, (unsigned long)sigsys->_call_addr);
} }
FIXTURE_DATA(precedence) { FIXTURE(precedence) {
struct sock_fprog allow; struct sock_fprog allow;
struct sock_fprog log; struct sock_fprog log;
struct sock_fprog trace; struct sock_fprog trace;
...@@ -1509,7 +1509,7 @@ void tracer_poke(struct __test_metadata *_metadata, pid_t tracee, int status, ...@@ -1509,7 +1509,7 @@ void tracer_poke(struct __test_metadata *_metadata, pid_t tracee, int status,
EXPECT_EQ(0, ret); EXPECT_EQ(0, ret);
} }
FIXTURE_DATA(TRACE_poke) { FIXTURE(TRACE_poke) {
struct sock_fprog prog; struct sock_fprog prog;
pid_t tracer; pid_t tracer;
long poked; long poked;
...@@ -1817,7 +1817,7 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, ...@@ -1817,7 +1817,7 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,
change_syscall(_metadata, tracee, -1, -ESRCH); change_syscall(_metadata, tracee, -1, -ESRCH);
} }
FIXTURE_DATA(TRACE_syscall) { FIXTURE(TRACE_syscall) {
struct sock_fprog prog; struct sock_fprog prog;
pid_t tracer, mytid, mypid, parent; pid_t tracer, mytid, mypid, parent;
}; };
...@@ -2321,7 +2321,7 @@ struct tsync_sibling { ...@@ -2321,7 +2321,7 @@ struct tsync_sibling {
} \ } \
} while (0) } while (0)
FIXTURE_DATA(TSYNC) { FIXTURE(TSYNC) {
struct sock_fprog root_prog, apply_prog; struct sock_fprog root_prog, apply_prog;
struct tsync_sibling sibling[TSYNC_SIBLINGS]; struct tsync_sibling sibling[TSYNC_SIBLINGS];
sem_t started; sem_t started;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment