tests: (libmount) make X-* and x-* more robust

Addresses: https://github.com/karelzak/util-linux/issues/818
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/libmount/context-X-mount.mkdir b/tests/expected/libmount/context-X-comment
similarity index 100%
rename from tests/expected/libmount/context-X-mount.mkdir
rename to tests/expected/libmount/context-X-comment

diff --git a/tests/expected/libmount/context-x-mount.mkdir b/tests/expected/libmount/context-x-permanent
similarity index 100%
rename from tests/expected/libmount/context-x-mount.mkdir
rename to tests/expected/libmount/context-x-permanent

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 3750c701fb5205bf845f1bb659143ebcd6ba2bd6..6dd35b193bd9da64b6ce97da7e4bd92ab912cf7e 100755 (executable)
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -146,8 +146,8 @@ is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
 
-# deprecated
-ts_init_subtest "x-mount.mkdir"
+# deprecated (x-* mount option maintained in userspace (e.g. utab)
+ts_init_subtest "x-permanent"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST
 
@@ -159,7 +159,8 @@ $TS_CMD_UMOUNT $TS_NOEXIST
 rmdir $TS_NOEXIST
 
 
-ts_init_subtest "X-mount.mkdir"
+# X-* comment
+ts_init_subtest "X-comment"
 TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex"
 [ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST