diff options
| author | Karel Zak | 2012-04-18 13:05:55 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-04-18 13:05:55 +0200 |
| commit | f947ae75b62cf86ee83db52c27a17137d736b5b7 (patch) | |
| tree | 938026bcdc17ec2e44c831ae5226162d39c846fe /tests/ts/swapon | |
| parent | swapon: minor coding style changes (diff) | |
| download | kernel-qcow2-util-linux-f947ae75b62cf86ee83db52c27a17137d736b5b7.tar.gz kernel-qcow2-util-linux-f947ae75b62cf86ee83db52c27a17137d736b5b7.tar.xz kernel-qcow2-util-linux-f947ae75b62cf86ee83db52c27a17137d736b5b7.zip | |
tests: remove LD_LIBRARY_PATH from swapon tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/swapon')
| -rwxr-xr-x | tests/ts/swapon/devname | 5 | ||||
| -rwxr-xr-x | tests/ts/swapon/fixpgsz | 5 | ||||
| -rwxr-xr-x | tests/ts/swapon/fixsig | 5 | ||||
| -rwxr-xr-x | tests/ts/swapon/label | 5 | ||||
| -rwxr-xr-x | tests/ts/swapon/uuid | 5 |
5 files changed, 10 insertions, 15 deletions
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname index 917b40b3c..cbab1285d 100755 --- a/tests/ts/swapon/devname +++ b/tests/ts/swapon/devname @@ -32,12 +32,11 @@ $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \ ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE -LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ - $TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT +$TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE -ts_swapoff $DEVICE +$TS_CMD_SWAPOFF $DEVICE ts_device_deinit $DEVICE ts_log "Success" diff --git a/tests/ts/swapon/fixpgsz b/tests/ts/swapon/fixpgsz index ee03dde6a..0a694add3 100755 --- a/tests/ts/swapon/fixpgsz +++ b/tests/ts/swapon/fixpgsz @@ -32,12 +32,11 @@ ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEV # # Swapon # -LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ - $TS_CMD_SWAPON --fixpgsz $DEVICE &> /dev/null +$TS_CMD_SWAPON --fixpgsz $DEVICE &> /dev/null grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE -ts_swapoff $DEVICE +$TS_CMD_SWAPOFF $DEVICE ts_device_deinit $DEVICE ts_log "Success" diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig index c3b811e81..2005dec4b 100755 --- a/tests/ts/swapon/fixsig +++ b/tests/ts/swapon/fixsig @@ -34,12 +34,11 @@ ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DE # # Swapon # -LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ - $TS_CMD_SWAPON $DEVICE &> /dev/null +$TS_CMD_SWAPON $DEVICE &> /dev/null grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE -ts_swapoff $DEVICE +$TS_CMD_SWAPOFF $DEVICE ts_device_deinit $DEVICE ts_log "Success" diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label index 3a5baa142..5df0541c1 100755 --- a/tests/ts/swapon/label +++ b/tests/ts/swapon/label @@ -34,12 +34,11 @@ $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \ ts_device_has "LABEL" $LABEL $DEVICE \ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE -LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ - $TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT +$TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE -ts_swapoff $DEVICE +$TS_CMD_SWAPOFF $DEVICE ts_device_deinit $DEVICE ts_log "Success" diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid index 413b46b91..f40720ce2 100755 --- a/tests/ts/swapon/uuid +++ b/tests/ts/swapon/uuid @@ -34,12 +34,11 @@ ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE UUID=$(ts_uuid_by_devname $DEVICE) -LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \ - $TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT +$TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE -ts_swapoff $DEVICE +$TS_CMD_SWAPOFF $DEVICE ts_device_deinit $DEVICE ts_log "Success" |