From 8ebecc18e859474986cdb2fbe9fa3419e3417e28 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 15 Jul 2019 12:46:11 +0200 Subject: tests: (libmount) make X-* and x-* more robust Addresses: https://github.com/karelzak/util-linux/issues/818 Signed-off-by: Karel Zak --- tests/expected/libmount/context-X-comment | 1 + tests/expected/libmount/context-X-mount.mkdir | 1 - tests/expected/libmount/context-x-mount.mkdir | 1 - tests/expected/libmount/context-x-permanent | 1 + tests/ts/libmount/context | 7 ++++--- 5 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 tests/expected/libmount/context-X-comment delete mode 100644 tests/expected/libmount/context-X-mount.mkdir delete mode 100644 tests/expected/libmount/context-x-mount.mkdir create mode 100644 tests/expected/libmount/context-x-permanent diff --git a/tests/expected/libmount/context-X-comment b/tests/expected/libmount/context-X-comment new file mode 100644 index 000000000..7504a7e83 --- /dev/null +++ b/tests/expected/libmount/context-X-comment @@ -0,0 +1 @@ +successfully mounted diff --git a/tests/expected/libmount/context-X-mount.mkdir b/tests/expected/libmount/context-X-mount.mkdir deleted file mode 100644 index 7504a7e83..000000000 --- a/tests/expected/libmount/context-X-mount.mkdir +++ /dev/null @@ -1 +0,0 @@ -successfully mounted diff --git a/tests/expected/libmount/context-x-mount.mkdir b/tests/expected/libmount/context-x-mount.mkdir deleted file mode 100644 index 7504a7e83..000000000 --- a/tests/expected/libmount/context-x-mount.mkdir +++ /dev/null @@ -1 +0,0 @@ -successfully mounted diff --git a/tests/expected/libmount/context-x-permanent b/tests/expected/libmount/context-x-permanent new file mode 100644 index 000000000..7504a7e83 --- /dev/null +++ b/tests/expected/libmount/context-x-permanent @@ -0,0 +1 @@ +successfully mounted diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 3750c701f..6dd35b193 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 -- cgit v1.2.3-55-g7522