| Message ID | 20200313031752.2332565-2-kuba@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kselftest: add fixture parameters | expand |
On Thu, Mar 12, 2020 at 08:17:48PM -0700, Jakub Kicinski wrote: > Quoting kdoc: > > FIXTURE_DATA: > * This call may be used when the type of the fixture data > * is needed. In general, this should not be needed unless > * the *self* is being passed to a helper directly. > > FIXTURE: > * Defines the data provided to TEST_F()-defined tests as *self*. It should be > * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN(). > > seccomp should use FIXTURE to declare types. Yup, I ran into this while working on a totally separate series. I sent a stand-alone patch for this already. (It's identical to this one.) Shuah can take either one. :) > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Kees Cook <keescook@chromium.org> -Kees > --- > tools/testing/selftests/seccomp/seccomp_bpf.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c > index ee1b727ede04..7bf82fb07f67 100644 > --- a/tools/testing/selftests/seccomp/seccomp_bpf.c > +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c > @@ -909,7 +909,7 @@ TEST(ERRNO_order) > EXPECT_EQ(12, errno); > } > > -FIXTURE_DATA(TRAP) { > +FIXTURE(TRAP) { > struct sock_fprog prog; > }; > > @@ -1020,7 +1020,7 @@ TEST_F(TRAP, handler) > EXPECT_NE(0, (unsigned long)sigsys->_call_addr); > } > > -FIXTURE_DATA(precedence) { > +FIXTURE(precedence) { > struct sock_fprog allow; > struct sock_fprog log; > struct sock_fprog trace; > @@ -1509,7 +1509,7 @@ void tracer_poke(struct __test_metadata *_metadata, pid_t tracee, int status, > EXPECT_EQ(0, ret); > } > > -FIXTURE_DATA(TRACE_poke) { > +FIXTURE(TRACE_poke) { > struct sock_fprog prog; > pid_t tracer; > long poked; > @@ -1817,7 +1817,7 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, > change_syscall(_metadata, tracee, -1, -ESRCH); > } > > -FIXTURE_DATA(TRACE_syscall) { > +FIXTURE(TRACE_syscall) { > struct sock_fprog prog; > pid_t tracer, mytid, mypid, parent; > }; > @@ -2321,7 +2321,7 @@ struct tsync_sibling { > } \ > } while (0) > > -FIXTURE_DATA(TSYNC) { > +FIXTURE(TSYNC) { > struct sock_fprog root_prog, apply_prog; > struct tsync_sibling sibling[TSYNC_SIBLINGS]; > sem_t started; > -- > 2.24.1 >
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index ee1b727ede04..7bf82fb07f67 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -909,7 +909,7 @@ TEST(ERRNO_order) EXPECT_EQ(12, errno); } -FIXTURE_DATA(TRAP) { +FIXTURE(TRAP) { struct sock_fprog prog; }; @@ -1020,7 +1020,7 @@ TEST_F(TRAP, handler) EXPECT_NE(0, (unsigned long)sigsys->_call_addr); } -FIXTURE_DATA(precedence) { +FIXTURE(precedence) { struct sock_fprog allow; struct sock_fprog log; struct sock_fprog trace; @@ -1509,7 +1509,7 @@ void tracer_poke(struct __test_metadata *_metadata, pid_t tracee, int status, EXPECT_EQ(0, ret); } -FIXTURE_DATA(TRACE_poke) { +FIXTURE(TRACE_poke) { struct sock_fprog prog; pid_t tracer; long poked; @@ -1817,7 +1817,7 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, change_syscall(_metadata, tracee, -1, -ESRCH); } -FIXTURE_DATA(TRACE_syscall) { +FIXTURE(TRACE_syscall) { struct sock_fprog prog; pid_t tracer, mytid, mypid, parent; }; @@ -2321,7 +2321,7 @@ struct tsync_sibling { } \ } while (0) -FIXTURE_DATA(TSYNC) { +FIXTURE(TSYNC) { struct sock_fprog root_prog, apply_prog; struct tsync_sibling sibling[TSYNC_SIBLINGS]; sem_t started;
Quoting kdoc: FIXTURE_DATA: * This call may be used when the type of the fixture data * is needed. In general, this should not be needed unless * the *self* is being passed to a helper directly. FIXTURE: * Defines the data provided to TEST_F()-defined tests as *self*. It should be * populated and cleaned up using FIXTURE_SETUP() and FIXTURE_TEARDOWN(). seccomp should use FIXTURE to declare types. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- tools/testing/selftests/seccomp/seccomp_bpf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)