Update to upstream util-linux 2.20.1

[framework/base/util-linux-ng.git] / tests / ts / swapon / label

diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 299572c..3a5baa1 100755 (executable)
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
 #
-# This file is part of util-linux-ng.
+# This file is part of util-linux.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -32,13 +32,12 @@ $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
  || ts_die "Cannot make swap on $DEVICE" $DEVICE
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
 
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $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 found $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
 
 ts_swapoff $DEVICE
 ts_device_deinit $DEVICE