| From de46d138e7735eded9756906747fd3a8c3a42225 Mon Sep 17 00:00:00 2001 |
| From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org> |
| Date: Wed, 31 Jan 2024 22:49:52 +0100 |
| Subject: selftests: mptcp: allow changing subtests prefix |
| |
| From: Matthieu Baerts (NGI0) <matttbe@kernel.org> |
| |
| 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@vger.kernel.org |
| Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> |
| Link: https://lore.kernel.org/r/20240131-upstream-net-20240131-mptcp-ci-issues-v1-7-4c1c11e571ff@kernel.org |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/testing/selftests/net/mptcp/mptcp_lib.sh | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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=() |
| |
