2022-08-19 19:17:46

by Axel Rasmussen

[permalink] [raw]
Subject: [PATCH] selftests: fix a couple missing .gitignore entries

Some recent commits added new test binaries, but forgot to add those to
.gitignore. Now, after one does "make -C tools/testing/selftests", one
ends up with some untracked files in the kernel tree.

Add the test binaries to .gitignore, to avoid this minor annoyance.

Fixes: d8b6171bd58a ("selftests/io_uring: test zerocopy send")
Fixes: 6342140db660 ("selftests/timens: add a test for vfork+exit")
Signed-off-by: Axel Rasmussen <[email protected]>
---
tools/testing/selftests/net/.gitignore | 3 ++-
tools/testing/selftests/timens/.gitignore | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
index 0e5751af6247..02abf8fdfd3a 100644
--- a/tools/testing/selftests/net/.gitignore
+++ b/tools/testing/selftests/net/.gitignore
@@ -39,4 +39,5 @@ toeplitz
tun
cmsg_sender
unix_connect
-tap
\ No newline at end of file
+tap
+io_uring_zerocopy_tx
diff --git a/tools/testing/selftests/timens/.gitignore b/tools/testing/selftests/timens/.gitignore
index fe1eb8271b35..cae8dca0fbff 100644
--- a/tools/testing/selftests/timens/.gitignore
+++ b/tools/testing/selftests/timens/.gitignore
@@ -8,3 +8,4 @@ procfs
timens
timer
timerfd
+vfork_exec
--
2.37.1.595.g718a3a8f04-goog


2022-08-19 19:31:04

by Kees Cook

[permalink] [raw]
Subject: Re: [PATCH] selftests: fix a couple missing .gitignore entries

On Fri, Aug 19, 2022 at 12:05:58PM -0700, Axel Rasmussen wrote:
> Some recent commits added new test binaries, but forgot to add those to
> .gitignore. Now, after one does "make -C tools/testing/selftests", one
> ends up with some untracked files in the kernel tree.
>
> Add the test binaries to .gitignore, to avoid this minor annoyance.
>
> Fixes: d8b6171bd58a ("selftests/io_uring: test zerocopy send")
> Fixes: 6342140db660 ("selftests/timens: add a test for vfork+exit")
> Signed-off-by: Axel Rasmussen <[email protected]>

Reviewed-by: Kees Cook <[email protected]>

--
Kees Cook

2022-08-19 23:16:00

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] selftests: fix a couple missing .gitignore entries

On Fri, 19 Aug 2022 12:05:58 -0700 Axel Rasmussen wrote:
> Some recent commits added new test binaries, but forgot to add those to
> .gitignore. Now, after one does "make -C tools/testing/selftests", one
> ends up with some untracked files in the kernel tree.
>
> Add the test binaries to .gitignore, to avoid this minor annoyance.
>
> Fixes: d8b6171bd58a ("selftests/io_uring: test zerocopy send")
> Fixes: 6342140db660 ("selftests/timens: add a test for vfork+exit")
> Signed-off-by: Axel Rasmussen <[email protected]>
> ---
> tools/testing/selftests/net/.gitignore | 3 ++-
> tools/testing/selftests/timens/.gitignore | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
> index 0e5751af6247..02abf8fdfd3a 100644
> --- a/tools/testing/selftests/net/.gitignore
> +++ b/tools/testing/selftests/net/.gitignore
> @@ -39,4 +39,5 @@ toeplitz
> tun
> cmsg_sender
> unix_connect
> -tap
> \ No newline at end of file
> +tap
> +io_uring_zerocopy_tx

Could you make the io_uring test the first in the file?
That'd gets us closest to the alphabetical ordering (I know the file is
not ordered now, but we should start moving that way).

2022-08-22 17:44:28

by Axel Rasmussen

[permalink] [raw]
Subject: Re: [PATCH] selftests: fix a couple missing .gitignore entries

On Fri, Aug 19, 2022 at 4:07 PM Jakub Kicinski <[email protected]> wrote:
>
> On Fri, 19 Aug 2022 12:05:58 -0700 Axel Rasmussen wrote:
> > Some recent commits added new test binaries, but forgot to add those to
> > .gitignore. Now, after one does "make -C tools/testing/selftests", one
> > ends up with some untracked files in the kernel tree.
> >
> > Add the test binaries to .gitignore, to avoid this minor annoyance.
> >
> > Fixes: d8b6171bd58a ("selftests/io_uring: test zerocopy send")
> > Fixes: 6342140db660 ("selftests/timens: add a test for vfork+exit")
> > Signed-off-by: Axel Rasmussen <[email protected]>
> > ---
> > tools/testing/selftests/net/.gitignore | 3 ++-
> > tools/testing/selftests/timens/.gitignore | 1 +
> > 2 files changed, 3 insertions(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore
> > index 0e5751af6247..02abf8fdfd3a 100644
> > --- a/tools/testing/selftests/net/.gitignore
> > +++ b/tools/testing/selftests/net/.gitignore
> > @@ -39,4 +39,5 @@ toeplitz
> > tun
> > cmsg_sender
> > unix_connect
> > -tap
> > \ No newline at end of file
> > +tap
> > +io_uring_zerocopy_tx
>
> Could you make the io_uring test the first in the file?
> That'd gets us closest to the alphabetical ordering (I know the file is
> not ordered now, but we should start moving that way).

It isn't that it's mostly ordered with a few exceptions, to me it
looks entirely random. I don't mind moving the one I'm adding but, I'm
not sure it gives much value given that.

Would folks object to just adding a second commit to this which sorts
the file? Since this file isn't changed frequently, I would say the
risk of annoying conflicts is pretty low.

2022-08-22 18:31:17

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] selftests: fix a couple missing .gitignore entries

On Mon, 22 Aug 2022 09:17:57 -0700 Axel Rasmussen wrote:
> > Could you make the io_uring test the first in the file?
> > That'd gets us closest to the alphabetical ordering (I know the file is
> > not ordered now, but we should start moving that way).
>
> It isn't that it's mostly ordered with a few exceptions, to me it
> looks entirely random. I don't mind moving the one I'm adding but, I'm
> not sure it gives much value given that.
>
> Would folks object to just adding a second commit to this which sorts
> the file? Since this file isn't changed frequently, I would say the
> risk of annoying conflicts is pretty low.

It's a major source of conflicts for us, because everyone adds at
the end but patches may come in via multiple trees and pull requests.

I'm not opposed to the sort tho, maybe it's best to rip the band-aid
off once and for all.