diff options
| author | Ruediger Meier | 2015-03-31 14:35:07 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2015-04-14 13:18:43 +0200 |
| commit | f1849be96a2f3baff3a7c3776be2d02af20bea81 (patch) | |
| tree | 5c2c7e4c0b9b163f281726b6723fe561eb493b29 /tests/ts/swapon | |
| parent | tests: scsi_debug tests, don't call ts_die() with DEVICE parameter (diff) | |
| download | kernel-qcow2-util-linux-f1849be96a2f3baff3a7c3776be2d02af20bea81.tar.gz kernel-qcow2-util-linux-f1849be96a2f3baff3a7c3776be2d02af20bea81.tar.xz kernel-qcow2-util-linux-f1849be96a2f3baff3a7c3776be2d02af20bea81.zip | |
tests: loop tests, don't call ts_die() with DEVICE parameter
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/swapon')
| -rwxr-xr-x | tests/ts/swapon/devname | 6 | ||||
| -rwxr-xr-x | tests/ts/swapon/fixpgsz | 6 | ||||
| -rwxr-xr-x | tests/ts/swapon/fixsig | 8 | ||||
| -rwxr-xr-x | tests/ts/swapon/label | 6 | ||||
| -rwxr-xr-x | tests/ts/swapon/uuid | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname index 59d8e1ec0..e1ae4f5a4 100755 --- a/tests/ts/swapon/devname +++ b/tests/ts/swapon/devname @@ -34,13 +34,13 @@ ts_device_init DEVICE=$TS_LODEV $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ - || ts_die "Cannot make swap $DEVICE" $DEVICE + || ts_die "Cannot make swap $DEVICE" -ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE +ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT -grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE +grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $TS_CMD_SWAPOFF $DEVICE diff --git a/tests/ts/swapon/fixpgsz b/tests/ts/swapon/fixpgsz index 1e6a7ccc1..b1f4035fd 100755 --- a/tests/ts/swapon/fixpgsz +++ b/tests/ts/swapon/fixpgsz @@ -32,16 +32,16 @@ ts_device_init DEVICE=$TS_LODEV $TS_CMD_MKSWAP -L MyFooBarLabel --pagesize $BADSIZE $DEVICE > /dev/null &> /dev/null \ - || ts_die "Cannot make swap $DEVICE" $DEVICE + || ts_die "Cannot make swap $DEVICE" -ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE +ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" # # Swapon # $TS_CMD_SWAPON --fixpgsz $DEVICE &> /dev/null -grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE +grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $TS_CMD_SWAPOFF $DEVICE diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig index 056445946..3d1bf6355 100755 --- a/tests/ts/swapon/fixsig +++ b/tests/ts/swapon/fixsig @@ -24,9 +24,9 @@ ts_device_init DEVICE=$TS_LODEV $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ - || ts_die "Cannot make swap $DEVICE" $DEVICE + || ts_die "Cannot make swap $DEVICE" -ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE +ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" # # Rewrite signature to swsuspend @@ -35,14 +35,14 @@ echo "S2SUSPEND " > $TS_OUTPUT.signature dd if=$TS_OUTPUT.signature of=$DEVICE \ seek=$(( $PAGESIZE - 10 )) count=10 bs=1 conv=notrunc &> /dev/null -ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DEVICE" $DEVICE +ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DEVICE" # # Swapon # $TS_CMD_SWAPON $DEVICE &> /dev/null -grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE +grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $TS_CMD_SWAPOFF $DEVICE diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label index 488531ab7..2018f9cfb 100755 --- a/tests/ts/swapon/label +++ b/tests/ts/swapon/label @@ -35,14 +35,14 @@ ts_device_init DEVICE=$TS_LODEV $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \ - || ts_die "Cannot make swap on $DEVICE" $DEVICE + || ts_die "Cannot make swap on $DEVICE" ts_device_has "LABEL" $LABEL $DEVICE \ - || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE + || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT -grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE +grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $TS_CMD_SWAPOFF $DEVICE diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid index b01d9b17b..65d019c29 100755 --- a/tests/ts/swapon/uuid +++ b/tests/ts/swapon/uuid @@ -34,15 +34,15 @@ ts_device_init DEVICE=$TS_LODEV $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ - || ts_die "Cannot make swap $DEVICE" $DEVICE + || ts_die "Cannot make swap $DEVICE" -ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE +ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" UUID=$(ts_uuid_by_devname $DEVICE) $TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT -grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE +grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $TS_CMD_SWAPOFF $DEVICE |