This is a note to let you know that I've just added the patch titled
selftests: mptcp: allow changing subtests prefix
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
selftests-mptcp-allow-changing-subtests-prefix.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From de46d138e7735eded9756906747fd3a8c3a42225 Mon Sep 17 00:00:00 2001
From: "Matthieu Baerts (NGI0)" <matttbe@xxxxxxxxxx>
Date: Wed, 31 Jan 2024 22:49:52 +0100
Subject: selftests: mptcp: allow changing subtests prefix
From: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
commit de46d138e7735eded9756906747fd3a8c3a42225 upstream.
If a CI executes the same selftest multiple times with different
options, all results from the same subtests will have the same title,
which confuse the CI. With the same title printed in TAP, the tests are
considered as the same ones.
Now, it is possible to override this prefix by using MPTCP_LIB_KSFT_TEST
env var, and have a different title.
While at it, use 'basename' to remove the suffix as well instead of
using an extra 'sed'.
Fixes: c4192967e62f ("selftests: mptcp: lib: format subtests results in TAP")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-7-4c1c11e571ff@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 022262a2cfe0..3a2abae5993e 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -6,7 +6,7 @@ readonly KSFT_FAIL=1
readonly KSFT_SKIP=4
# shellcheck disable=SC2155 # declare and assign separately
-readonly KSFT_TEST=$(basename "${0}" | sed 's/\.sh$//g')
+readonly KSFT_TEST="${MPTCP_LIB_KSFT_TEST:-$(basename "${0}" .sh)}"
MPTCP_LIB_SUBTESTS=()
--
2.43.2
Patches currently in stable-queue which might be from matttbe@xxxxxxxxxx are
queue-6.6/mptcp-really-cope-with-fastopen-race.patch
queue-6.6/mptcp-fix-rcv-space-initialization.patch
queue-6.6/selftests-mptcp-allow-changing-subtests-prefix.patch
queue-6.6/selftests-mptcp-add-missing-kconfig-for-nf-filter.patch
queue-6.6/mptcp-drop-the-push_pending-field.patch
queue-6.6/mptcp-fix-data-re-injection-from-stale-subflow.patch
queue-6.6/selftests-mptcp-increase-timeout-to-30-min.patch
queue-6.6/selftests-mptcp-add-mptcp_lib_kill_wait.patch
queue-6.6/selftests-mptcp-add-missing-kconfig-for-nf-mangle.patch
queue-6.6/mptcp-check-addrs-list-in-userspace_pm_get_local_id.patch
queue-6.6/selftests-mptcp-add-missing-kconfig-for-nf-filter-in-v6.patch
