This series is a cherry-pick on top of v6.12-rc1 from the one I sent for selftests with other patches that were not net-related:
https://lore.kernel.org/all/20240925-selftests-gitignore-v3-0-9db896474170@g...
The patches have not been modified, and the Reviewed-by tags have been kept.
Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- Javier Carrasco (3): selftests: net: add msg_oob to gitignore selftests: net: rds: add include.sh to EXTRA_CLEAN selftests: net: rds: add gitignore file for include.sh
tools/testing/selftests/net/.gitignore | 1 + tools/testing/selftests/net/rds/.gitignore | 1 + tools/testing/selftests/net/rds/Makefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) --- base-commit: 9852d85ec9d492ebef56dc5f229416c925758edc change-id: 20240930-net-selftests-gitignore-18b844f29391
Best regards,
This executable is missing from the corresponding gitignore file. Add msg_oob to the net gitignore list.
Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- tools/testing/selftests/net/.gitignore | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 1c04c780db66..9dcdff533414 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -17,6 +17,7 @@ ipv6_flowlabel ipv6_flowlabel_mgr log.txt msg_zerocopy +msg_oob ncdevmem nettest psock_fanout
The include.sh file is generated when building the net/rds selftests, but there is no rule to delete it with the clean target. Add the file to EXTRA_CLEAN in order to remove it when required.
Reviewed-by: Allison Henderson allison.henderson@oracle.com Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- tools/testing/selftests/net/rds/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/rds/Makefile b/tools/testing/selftests/net/rds/Makefile index da9714bc7aad..0b697669ea51 100644 --- a/tools/testing/selftests/net/rds/Makefile +++ b/tools/testing/selftests/net/rds/Makefile @@ -7,6 +7,6 @@ TEST_PROGS := run.sh \ include.sh \ test.py
-EXTRA_CLEAN := /tmp/rds_logs +EXTRA_CLEAN := /tmp/rds_logs include.sh
include ../../lib.mk
The generated include.sh should be ignored by git. Create a new gitignore and add the file to the list.
Reviewed-by: Allison Henderson allison.henderson@oracle.com Signed-off-by: Javier Carrasco javier.carrasco.cruz@gmail.com --- tools/testing/selftests/net/rds/.gitignore | 1 + 1 file changed, 1 insertion(+)
diff --git a/tools/testing/selftests/net/rds/.gitignore b/tools/testing/selftests/net/rds/.gitignore new file mode 100644 index 000000000000..1c6f04e2aa11 --- /dev/null +++ b/tools/testing/selftests/net/rds/.gitignore @@ -0,0 +1 @@ +include.sh
On Mon, 30 Sep 2024 19:34:09 +0200 Javier Carrasco wrote:
This series is a cherry-pick on top of v6.12-rc1 from the one I sent for selftests with other patches that were not net-related:
https://lore.kernel.org/all/20240925-selftests-gitignore-v3-0-9db896474170@g...
The patches have not been modified, and the Reviewed-by tags have been kept.
We merged commit 8ed7cf66f484 ("selftests: rds: move include.sh to TEST_FILES") in meantime, now we have a slight conflict on patch 2. Could you rebase and repost?
I'd designate the repost as "PATCH net v2", indicating that we probably want to send these to Linus before 6.12
linux-kselftest-mirror@lists.linaro.org
-
Jakub Kicinski -
Javier Carrasco