diff options
| author | Karel Zak | 2019-07-15 12:46:11 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-07-15 12:46:11 +0200 |
| commit | 8ebecc18e859474986cdb2fbe9fa3419e3417e28 (patch) | |
| tree | 79db3399823a906a1558616e3b9eb96ccc7b0786 | |
| parent | lsblk: fix -E segfault (diff) | |
| download | kernel-qcow2-util-linux-8ebecc18e859474986cdb2fbe9fa3419e3417e28.tar.gz kernel-qcow2-util-linux-8ebecc18e859474986cdb2fbe9fa3419e3417e28.tar.xz kernel-qcow2-util-linux-8ebecc18e859474986cdb2fbe9fa3419e3417e28.zip | |
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>
| -rw-r--r-- | tests/expected/libmount/context-X-comment (renamed from tests/expected/libmount/context-X-mount.mkdir) | 0 | ||||
| -rw-r--r-- | tests/expected/libmount/context-x-permanent (renamed from tests/expected/libmount/context-x-mount.mkdir) | 0 | ||||
| -rwxr-xr-x | tests/ts/libmount/context | 7 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tests/expected/libmount/context-X-mount.mkdir b/tests/expected/libmount/context-X-comment index 7504a7e83..7504a7e83 100644 --- a/tests/expected/libmount/context-X-mount.mkdir +++ b/tests/expected/libmount/context-X-comment diff --git a/tests/expected/libmount/context-x-mount.mkdir b/tests/expected/libmount/context-x-permanent index 7504a7e83..7504a7e83 100644 --- a/tests/expected/libmount/context-x-mount.mkdir +++ b/tests/expected/libmount/context-x-permanent 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 |