From 8ebecc18e859474986cdb2fbe9fa3419e3417e28 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 15 Jul 2019 12:46:11 +0200 Subject: [PATCH] tests: (libmount) make X-* and x-* more robust Addresses: https://github.com/karelzak/util-linux/issues/818 Signed-off-by: Karel Zak --- .../libmount/{context-X-mount.mkdir => context-X-comment} | 0 .../{context-x-mount.mkdir => context-x-permanent} | 0 tests/ts/libmount/context | 7 ++++--- 3 files changed, 4 insertions(+), 3 deletions(-) rename tests/expected/libmount/{context-X-mount.mkdir => context-X-comment} (100%) rename tests/expected/libmount/{context-x-mount.mkdir => context-x-permanent} (100%) 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 3750c701fb..6dd35b193b 100755 --- 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 -- 2.47.3