[PATCH v1] selftests: Make test_harness.h more generally available

[PATCH v1] selftests: Make test_harness.h more generally available

[Mickaël Salaün]

The seccomp/test_harness.h file contains useful helpers to build tests.
Moving it to the selftest directory should benefit to other test
components.

Signed-off-by: Mickaël Salaün <mic@digikod.net>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Kees Cook <keescook@chromium.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Will Drewry <wad@chromium.org>
Link: https://lkml.kernel.org/r/CAGXu5j+8CVz8vL51DRYXqOY=xc3zuKFf=PTENe88XYHzFYidUQ@mail.gmail.com
---
 tools/testing/selftests/seccomp/seccomp_bpf.c        | 2 +-
 tools/testing/selftests/{seccomp => }/test_harness.h | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename tools/testing/selftests/{seccomp => }/test_harness.h (100%)

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 03f1fa495d74..d7095ff58e72 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -37,7 +37,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include "test_harness.h"
+#include "../test_harness.h"
 
 #ifndef PR_SET_PTRACER
 # define PR_SET_PTRACER 0x59616d61
diff --git a/tools/testing/selftests/seccomp/test_harness.h b/tools/testing/selftests/test_harness.h
similarity index 100%
rename from tools/testing/selftests/seccomp/test_harness.h
rename to tools/testing/selftests/test_harness.h
-- 
2.11.0

Re: [PATCH v1] selftests: Make test_harness.h more generally available

[Kees Cook]

On Sun, Apr 30, 2017 at 5:26 AM, Mickaël Salaün <mic@digikod.net> wrote:
> The seccomp/test_harness.h file contains useful helpers to build tests.
> Moving it to the selftest directory should benefit to other test
> components.

Unless Shuah thinks this should live in a new include/ directory, this
looks fine to me.

Acked-by: Kees Cook <keescook@chromium.org>

Thanks!

-Kees

>
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Cc: Andy Lutomirski <luto@amacapital.net>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Shuah Khan <shuah@kernel.org>
> Cc: Will Drewry <wad@chromium.org>
> Link: https://lkml.kernel.org/r/CAGXu5j+8CVz8vL51DRYXqOY=xc3zuKFf=PTENe88XYHzFYidUQ@mail.gmail.com
> ---
>  tools/testing/selftests/seccomp/seccomp_bpf.c        | 2 +-
>  tools/testing/selftests/{seccomp => }/test_harness.h | 0
>  2 files changed, 1 insertion(+), 1 deletion(-)
>  rename tools/testing/selftests/{seccomp => }/test_harness.h (100%)
>
> diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
> index 03f1fa495d74..d7095ff58e72 100644
> --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
> +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
> @@ -37,7 +37,7 @@
>  #include <unistd.h>
>  #include <sys/syscall.h>
>
> -#include "test_harness.h"
> +#include "../test_harness.h"
>
>  #ifndef PR_SET_PTRACER
>  # define PR_SET_PTRACER 0x59616d61
> diff --git a/tools/testing/selftests/seccomp/test_harness.h b/tools/testing/selftests/test_harness.h
> similarity index 100%
> rename from tools/testing/selftests/seccomp/test_harness.h
> rename to tools/testing/selftests/test_harness.h
> --
> 2.11.0
>



-- 
Kees Cook
Pixel Security

Re: [PATCH v1] selftests: Make test_harness.h more generally available

[Will Drewry]

On Sun, Apr 30, 2017 at 12:39 PM, Kees Cook <keescook@chromium.org> wrote:
>
> On Sun, Apr 30, 2017 at 5:26 AM, Mickaël Salaün <mic@digikod.net> wrote:
> > The seccomp/test_harness.h file contains useful helpers to build tests.
> > Moving it to the selftest directory should benefit to other test
> > components.
>
> Unless Shuah thinks this should live in a new include/ directory, this
> looks fine to me.
>
> Acked-by: Kees Cook <keescook@chromium.org>

Same here!

Acked-by: Will Drewry <wad@chromium.org>

>
> Thanks!
>
> -Kees
>
> >
> > Signed-off-by: Mickaël Salaün <mic@digikod.net>
> > Cc: Andy Lutomirski <luto@amacapital.net>
> > Cc: Kees Cook <keescook@chromium.org>
> > Cc: Shuah Khan <shuah@kernel.org>
> > Cc: Will Drewry <wad@chromium.org>
> > Link: https://lkml.kernel.org/r/CAGXu5j+8CVz8vL51DRYXqOY=xc3zuKFf=PTENe88XYHzFYidUQ@mail.gmail.com
> > ---
> >  tools/testing/selftests/seccomp/seccomp_bpf.c        | 2 +-
> >  tools/testing/selftests/{seccomp => }/test_harness.h | 0
> >  2 files changed, 1 insertion(+), 1 deletion(-)
> >  rename tools/testing/selftests/{seccomp => }/test_harness.h (100%)
> >
> > diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
> > index 03f1fa495d74..d7095ff58e72 100644
> > --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
> > +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
> > @@ -37,7 +37,7 @@
> >  #include <unistd.h>
> >  #include <sys/syscall.h>
> >
> > -#include "test_harness.h"
> > +#include "../test_harness.h"
> >
> >  #ifndef PR_SET_PTRACER
> >  # define PR_SET_PTRACER 0x59616d61
> > diff --git a/tools/testing/selftests/seccomp/test_harness.h b/tools/testing/selftests/test_harness.h
> > similarity index 100%
> > rename from tools/testing/selftests/seccomp/test_harness.h
> > rename to tools/testing/selftests/test_harness.h
> > --
> > 2.11.0
> >
>
>
>
> --
> Kees Cook
> Pixel Security

Re: [PATCH v1] selftests: Make test_harness.h more generally available

[Mickaël Salaün]

[-- Attachment #1.1: Type: text/plain, Size: 2521 bytes --]

Maybe an update on the MAINTAINERS file could help for future reviews?

diff --git a/MAINTAINERS b/MAINTAINERS
index c265a5fe4848..0361364afb50 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11254,6 +11254,7 @@ F:      kernel/seccomp.c
 F:     include/uapi/linux/seccomp.h
 F:     include/linux/seccomp.h
 F:     tools/testing/selftests/seccomp/*
+F:     tools/testing/selftests/test_harness.h
 K:     \bsecure_computing
 K:     \bTIF_SECCOMP\b



On 30/04/2017 20:22, Will Drewry wrote:
> On Sun, Apr 30, 2017 at 12:39 PM, Kees Cook <keescook@chromium.org> wrote:
>>
>> On Sun, Apr 30, 2017 at 5:26 AM, Mickaël Salaün <mic@digikod.net> wrote:
>>> The seccomp/test_harness.h file contains useful helpers to build tests.
>>> Moving it to the selftest directory should benefit to other test
>>> components.
>>
>> Unless Shuah thinks this should live in a new include/ directory, this
>> looks fine to me.
>>
>> Acked-by: Kees Cook <keescook@chromium.org>
> 
> Same here!
> 
> Acked-by: Will Drewry <wad@chromium.org>
> 
>>
>> Thanks!
>>
>> -Kees
>>
>>>
>>> Signed-off-by: Mickaël Salaün <mic@digikod.net>
>>> Cc: Andy Lutomirski <luto@amacapital.net>
>>> Cc: Kees Cook <keescook@chromium.org>
>>> Cc: Shuah Khan <shuah@kernel.org>
>>> Cc: Will Drewry <wad@chromium.org>
>>> Link: https://lkml.kernel.org/r/CAGXu5j+8CVz8vL51DRYXqOY=xc3zuKFf=PTENe88XYHzFYidUQ@mail.gmail.com
>>> ---
>>>  tools/testing/selftests/seccomp/seccomp_bpf.c        | 2 +-
>>>  tools/testing/selftests/{seccomp => }/test_harness.h | 0
>>>  2 files changed, 1 insertion(+), 1 deletion(-)
>>>  rename tools/testing/selftests/{seccomp => }/test_harness.h (100%)
>>>
>>> diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
>>> index 03f1fa495d74..d7095ff58e72 100644
>>> --- a/tools/testing/selftests/seccomp/seccomp_bpf.c
>>> +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
>>> @@ -37,7 +37,7 @@
>>>  #include <unistd.h>
>>>  #include <sys/syscall.h>
>>>
>>> -#include "test_harness.h"
>>> +#include "../test_harness.h"
>>>
>>>  #ifndef PR_SET_PTRACER
>>>  # define PR_SET_PTRACER 0x59616d61
>>> diff --git a/tools/testing/selftests/seccomp/test_harness.h b/tools/testing/selftests/test_harness.h
>>> similarity index 100%
>>> rename from tools/testing/selftests/seccomp/test_harness.h
>>> rename to tools/testing/selftests/test_harness.h
>>> --
>>> 2.11.0
>>>
>>
>>
>>
>> --
>> Kees Cook
>> Pixel Security
> 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH v1] selftests: Make test_harness.h more generally available

[Shuah Khan]

On 04/30/2017 12:22 PM, Will Drewry wrote:
> On Sun, Apr 30, 2017 at 12:39 PM, Kees Cook <keescook@chromium.org> wrote:
>>
>> On Sun, Apr 30, 2017 at 5:26 AM, Mickaël Salaün <mic@digikod.net> wrote:
>>> The seccomp/test_harness.h file contains useful helpers to build tests.
>>> Moving it to the selftest directory should benefit to other test
>>> components.
>>
>> Unless Shuah thinks this should live in a new include/ directory, this
>> looks fine to me.
>>
>> Acked-by: Kees Cook <keescook@chromium.org>
> 
> Same here!
> 
> Acked-by: Will Drewry <wad@chromium.org>
> 
>>

I think the location fine. It will be a good idea to write
documentation on how to use this harness. I would recommend
rename the file to kselftest_harness.h and a doc file
kselftest_harness.txt which will go into Documentation directory.

thanks,
- Shuah