diff options
Diffstat (limited to 'tests/ts/libmount')
| -rwxr-xr-x | tests/ts/libmount/context | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index ebb244110..2d85dbb59 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -23,9 +23,6 @@ LABEL=libmount-test UUID=$($TS_CMD_UUIDGEN) MOUNTPOINT="$TS_MOUNTPOINT" -TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" -[ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST - [ -x $TESTPROG ] || ts_skip "test not compiled" ts_log "Init device" @@ -147,7 +144,11 @@ is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest +# deprecated ts_init_subtest "x-mount.mkdir" +TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" +[ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST + $TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && echo "successfully mounted" >> $TS_OUTPUT ts_finalize_subtest @@ -155,5 +156,17 @@ ts_finalize_subtest $TS_CMD_UMOUNT $TS_NOEXIST rmdir $TS_NOEXIST + +ts_init_subtest "X-mount.mkdir" +TS_NOEXIST="$TS_OUTDIR/${TS_TESTNAME}-${TS_SUBNAME}-noex" +[ -d $TS_NOEXIST ] && rmdir $TS_NOEXIST + +$TS_CMD_MOUNT -o X-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && + echo "successfully mounted" >> $TS_OUTPUT +ts_finalize_subtest + +$TS_CMD_UMOUNT $TS_NOEXIST +rmdir $TS_NOEXIST + ts_log "...done." ts_finalize |