From: Masatake YAMATO <yamato@redhat.com>
Date: Wed, 5 Mar 2025 14:25:52 +0000 (+0900)
Subject: tests: (lsns/nsfs) consider the cases that lsns returns multiple paths
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc5c86e91aa9a8fa386896865e069383c5bc4cac;p=thirdparty%2Futil-linux.git

tests: (lsns/nsfs) consider the cases that lsns returns multiple paths

Fixes #3442

If a target directory is bind-mount'ed, lsns returns multiple paths
as the value for NSFS column. This change considers this case.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/ts/lsns/nsfs b/tests/ts/lsns/nsfs
index 3401fb301..b01a0f6b2 100755
--- a/tests/ts/lsns/nsfs
+++ b/tests/ts/lsns/nsfs
@@ -79,8 +79,22 @@ fi
     dd if=/dev/zero bs=1 count=1 2> $NULL
 } > $FIFO
 
-test "$NSFS_NAMES_MLINES" = "$PATH1
-$PATH2" && test "$NSFS_NAMES_1LINE" = "$PATH1,$PATH2"
+
+does_combination_include()
+{
+    local p1 p2
+    for p1 in "$@"; do
+	for p2 in "$@"; do
+	    if [ "$p1" = "$PATH1" ] && [ "$p2" = "$PATH2" ]; then
+		return 0
+	    fi
+	done
+    done
+    return 1
+}
+
+does_combination_include $NSFS_NAMES_MLINES &&
+    does_combination_include ${NSFS_NAMES_1LINE//,/ }
 
 RESULT=$?
 echo $RESULT >> $TS_OUTPUT