From: Thomas Weißschuh <thomas@t-8ch.de>
Date: Wed, 29 Nov 2023 18:15:47 +0000 (+0100)
Subject: libmount: test utab options after helper call
X-Git-Tag: v2.40-rc1~136^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a06bd68bbc3c19fe2f70e37b45704374f8b179c;p=thirdparty%2Futil-linux.git

libmount: test utab options after helper call

See #2607

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---

diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index 359d8aaca7..40517e7116 100755
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -23,6 +23,7 @@ MOUNTER="/sbin/mount.mytest"
 ts_init "$*"
 
 ts_check_test_command "$TS_CMD_MOUNT"
+ts_check_test_command "$TS_CMD_UMOUNT"
 
 ts_skip_nonroot
 
@@ -55,7 +56,29 @@ ts_init_subtest "username"
 $TS_CMD_MOUNT -t mytest -ouser=name,abc /foo /bar &> $TS_OUTPUT
 ts_finalize_subtest
 
+ts_init_subtest "missing-options"
+
+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
+EOF
+
+mountpoint="$TS_OUTDIR/mnt"
+mkdir -p "$mountpoint"
+export LIBMOUNT_UTAB=$TS_OUTDIR/utab
+$TS_CMD_MOUNT -t mytest -o x-bar=BAR /foo "$mountpoint" &> $TS_OUTPUT
+cat "$LIBMOUNT_UTAB" \
+	| grep "$mountpoint" \
+	| sed -e "s|$mountpoint|/mountpoint|g" \
+	&> $TS_OUTPUT
+$TS_CMD_UMOUNT "$mountpoint"
+unset LIBMOUNT_UTAB
+
+ts_finalize_subtest
+
 rm -f $MOUNTER
 
 ts_finalize
-