From: Karel Zak <kzak@redhat.com>
Date: Fri, 1 Dec 2023 10:45:10 +0000 (+0100)
Subject: tests: make mount/special more robust
X-Git-Tag: v2.40-rc1~136^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e1d7bf84209e03ffe632f048fb8bbb1e6edacd4;p=thirdparty%2Futil-linux.git

tests: make mount/special more robust

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

diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index e1351e41e1..1771f5aac2 100755
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -58,34 +58,43 @@ ts_finalize_subtest
 
 
 ts_init_subtest "missing-options"
+
+grep -q 'nodev[[:space:]]*tmpfs' /proc/filesystems
+if [ "$?" == "0" ]; then
 cat > $MOUNTER <<EOF
 #!/bin/bash
 # This util-linux regression test component
 # It's safe to remove me...
 #
-$TS_CMD_MOUNT -t tmpfs -i "\$1" "\$2" -o x-foo=123
+exec $TS_CMD_MOUNT -t tmpfs -i "\$1" "\$2" -o x-foo=123
 EOF
-chmod +x $MOUNTER
-
-mountpoint="$TS_OUTDIR/mnt"
-mkdir -p "$mountpoint"
-export LIBMOUNT_UTAB=$TS_OUTDIR/utab
-rm -f $LIBMOUNT_UTAB
-> $LIBMOUNT_UTAB
-
-$TS_CMD_MOUNT -t mytest -o x-bar=BAR /foo "$mountpoint" &> $TS_OUTPUT
-udevadm settle
-
-cat "$LIBMOUNT_UTAB" \
-	| grep "$mountpoint" \
-	| sed -e "s|$mountpoint|/mountpoint|g" \
-	      -e 's/ID=[[:digit:]]* //g' \
-	&> $TS_OUTPUT
-$TS_CMD_UMOUNT "$mountpoint"
-unset LIBMOUNT_UTAB
-
-ts_finalize_subtest
-
-rm -f $MOUNTER
+	chmod +x $MOUNTER
+
+	mountpoint="$TS_OUTDIR/mnt"
+	mkdir -p "$mountpoint"
+	export LIBMOUNT_UTAB=$TS_OUTDIR/utab
+	rm -f $LIBMOUNT_UTAB
+	echo -n "" > $LIBMOUNT_UTAB
+
+	$TS_CMD_MOUNT -t mytest -o x-bar=BAR /foo "$mountpoint" &> $TS_OUTPUT
+	udevadm settle
+
+	grep -q "$mountpoint" /proc/mounts
+	if [ "$?" == "0" ]; then
+		cat "$LIBMOUNT_UTAB" \
+			| grep "$mountpoint" \
+			| sed -e "s|$mountpoint|/mountpoint|g" \
+			      -e 's/ID=[[:digit:]]* //g' \
+			&> $TS_OUTPUT
+		$TS_CMD_UMOUNT "$mountpoint"
+		unset LIBMOUNT_UTAB
+		rm -f $MOUNTER
+		ts_finalize_subtest
+	else
+		ts_skip_subtest "tmpfs not mounted"
+	fi
+else
+	ts_skip_subtest "tmpfs unsupported"
+fi
 
 ts_finalize