diff options
| author | Ruediger Meier | 2015-03-31 14:19:40 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2015-04-14 13:18:42 +0200 |
| commit | cbae7931c85d232269d45ec6766b293c40cbdb09 (patch) | |
| tree | b87f66967928f66a9ab8787a5b13c526a5d53024 /tests/ts/blkdiscard | |
| parent | tests: introduce ts_cleanup_on_exit() (diff) | |
| download | kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.tar.gz kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.tar.xz kernel-qcow2-util-linux-cbae7931c85d232269d45ec6766b293c40cbdb09.zip | |
tests: introduce TS_LOOP_DEVS for cleanup
We are maintaining an array TS_LOOP_DEVS to de-initialize devices
always on exit. Until now there was no cleanup in ts_skip().
The downside is that we can't execute ts_device_init() in a subshell
anymore. The device is returned via global variable TS_LODEV, similar
like we do already in ts_scsi_debug_init().
Tests which don't use ts_device_init() to create loop devices may use
ts_register_loop_device() to get them cleaned up later.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/blkdiscard')
| -rwxr-xr-x | tests/ts/blkdiscard/offsets | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ts/blkdiscard/offsets b/tests/ts/blkdiscard/offsets index 8776c6770..a1c899547 100755 --- a/tests/ts/blkdiscard/offsets +++ b/tests/ts/blkdiscard/offsets @@ -36,6 +36,7 @@ truncate -s 10M $IMAGE_PATH ts_log "create loop device from image" DEVICE=$($TS_CMD_LOSETUP --show -f $IMAGE_PATH) +ts_register_loop_device "$DEVICE" CMD_SED_DEVICE="sed s#$DEVICE:\s##" ts_log "testing offsets with full block size" @@ -82,7 +83,6 @@ $TS_CMD_BLKDISCARD -v -p 511 -o 1 -l 10240 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS $TS_CMD_BLKDISCARD -v -p 511 -o 511 -l 10240 $DEVICE 2>&1 | $CMD_SED_DEVICE >> $TS_OUTPUT ts_log "detach loop device from image" -$TS_CMD_LOSETUP -d $DEVICE 2>&1 >> $TS_OUTPUT ts_cd "$ORIGPWD" |