From: Karel Zak <kzak@redhat.com>
Date: Fri, 12 Mar 2021 10:39:12 +0000 (+0100)
Subject: tests: update mountpoint return code chack
X-Git-Tag: v2.37-rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b09ed927d79c17d7cc9eec5224118b4effd3a896;p=thirdparty%2Futil-linux.git

tests: update mountpoint return code chack

This is necessary due to e0ecd196414c03699cd8e8dd2c6f4fe533999837.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/ts/mount/move b/tests/ts/mount/move
index e828a8942c..9d2723a751 100755
--- a/tests/ts/mount/move
+++ b/tests/ts/mount/move
@@ -68,6 +68,11 @@ mount_and_check --move $DIR_A $DIR_B
 for f in `find $DIR_PRIVATE2 $DIR_PRIVATE`; do
 	xo="$($TS_CMD_MOUNTPOINT -q "$f" 2>&1)"
 	x=$?
+	# mountpoint(1) returns 32 if mountpoint does not exist, map it to 1 to
+	# be compatible with findmnt(8)
+	if [ "$x" = "32" ]; then
+		x=1
+	fi
 	yo="$($TS_CMD_FINDMNT --kernel --mountpoint "$f" 2>&1)"
 	y=$?