FAILED: patch "[PATCH] selftests: mptcp: join: helpers to skip tests" failed to apply to 5.15-stable tree

The patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x cdb50525345cf5a8359ee391032ef606a7826f08
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023062227-sporting-calcium-8268@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..

Possible dependencies:

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From cdb50525345cf5a8359ee391032ef606a7826f08 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <[email protected]>
Date: Sat, 10 Jun 2023 18:11:38 +0200
Subject: [PATCH] selftests: mptcp: join: helpers to skip tests

Selftests are supposed to run on any kernels, including the old ones not supporting all MPTCP features.

Here are some helpers that will be used to mark subtests as skipped if a feature is not supported. Marking as a fix for the commit introducing this selftest to help with the backports.

While at it, also check if kallsyms feature is available as it will also be used in the following commits to check if MPTCP features are available before starting a test.

index 74cc8a74a9d6..a63aed145393 100755
@@ -142,6 +142,7 @@ cleanup_partial()
 check_tools()
 {
 	mptcp_lib_check_mptcp
+	mptcp_lib_check_kallsyms
 
 	if ! ip -Version &> /dev/null; then
 		echo "SKIP: Could not run test without ip tool"

@@ -191,6 +192,32 @@ cleanup()
 	cleanup_partial
 }
 
+# $1: msg
+print_title()
+{
+	printf "%03u %-36s %s" "${TEST_COUNT}" "${TEST_NAME}" "${1}"
+}
+
+# [ $1: fail msg ]
+mark_as_skipped()
+{
+	local msg="${1:-"Feature not supported"}"
+
+	mptcp_lib_fail_if_expected_feature "${msg}"
+
+	print_title "[ skip ] ${msg}"
+	printf "\n"
+}
+
+# $@: condition
+continue_if()
+{
+	if ! "${@}"; then
+		mark_as_skipped
+		return 1
+	fi
+}
+
 skip_test()
 {
 	if [ "${#only_tests_ids[@]}" -eq 0 ] && [ "${#only_tests_names[@]}" -eq 0 ]; then

Hi Greg,

(...)

Thank you for this notification (and all the other ones and the backports linked to this series)! And sorry for all these conflicts :)

We don't need to backport this commit cdb50525345c ("selftests: mptcp:
join: helpers to skip tests"): it depends on a feature introduced in commit c7d49c033de0 ("selftests: mptcp: join: alt. to exec specific tests") and we don't want to backport this. Also, this fix here is mainly useful for the last stable version: I guess people will likely not take the selftests version from v5.15.y and run them on older kernels. They will more likely take the selftests from the last stable version (or the same version as the kernel one).

So no need to do anything here.

Cheers,
Matt

Tessares | Belgium | Hybrid Access Solutions
www.tessares.net