summaryrefslogtreecommitdiffstats
path: root/tests/ts/mount
diff options
context:
space:
mode:
authorRuediger Meier2015-03-31 16:07:37 +0200
committerRuediger Meier2015-04-02 12:36:29 +0200
commit6dd79fd40ae6a0e58e552769589c9b77ecd543a1 (patch)
tree7c1d37460fea84c92a8671b01b9c20e4a01e47e4 /tests/ts/mount
parenttests: ts_scsi_debug_init() sleeps a bit earlier (diff)
downloadkernel-qcow2-util-linux-6dd79fd40ae6a0e58e552769589c9b77ecd543a1.tar.gz
kernel-qcow2-util-linux-6dd79fd40ae6a0e58e552769589c9b77ecd543a1.tar.xz
kernel-qcow2-util-linux-6dd79fd40ae6a0e58e552769589c9b77ecd543a1.zip
tests: fix, don't call ts_die from subshell
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/mount')
-rwxr-xr-xtests/ts/mount/fslists4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index 5e0cbb8b4..944e8af55 100755
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -83,9 +83,7 @@ ts_finalize_subtest
ts_init_subtest "type-pattern-neg"
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
$TS_CMD_MOUNT -t nofoo,bar,ext3,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null
-ts_is_mounted $DEVICE && (
- $TS_CMD_UMOUNT $TS_MOUNTPOINT
- ts_die "$DEVICE unexpectedly mounted" $DEVICE)
+ts_is_mounted $DEVICE && ts_die "$DEVICE unexpectedly mounted" $DEVICE
ts_log "Success"
ts_finalize_subtest