summaryrefslogtreecommitdiffstats
path: root/tests/ts/swapon
diff options
context:
space:
mode:
authorKarel Zak2009-01-20 00:24:23 +0100
committerKarel Zak2009-02-11 23:32:58 +0100
commit632830ccf28d06444c50d14708240506e6a6d1fc (patch)
tree43aabd52f06f68b9eb28e9a77f72a996cc1a8795 /tests/ts/swapon
parenttests: cleanup ts/script (diff)
downloadkernel-qcow2-util-linux-632830ccf28d06444c50d14708240506e6a6d1fc.tar.gz
kernel-qcow2-util-linux-632830ccf28d06444c50d14708240506e6a6d1fc.tar.xz
kernel-qcow2-util-linux-632830ccf28d06444c50d14708240506e6a6d1fc.zip
tests: cleanup ts/swapon
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/swapon')
-rwxr-xr-xtests/ts/swapon/devname8
-rwxr-xr-xtests/ts/swapon/label9
-rwxr-xr-xtests/ts/swapon/uuid8
3 files changed, 9 insertions, 16 deletions
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname
index 954af8617..f6edd537e 100755
--- a/tests/ts/swapon/devname
+++ b/tests/ts/swapon/devname
@@ -15,12 +15,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="swapon"
-TS_DESC="devname"
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="by devname"
+. $TS_TOPDIR/functions.sh
ts_init "$*"
ts_skip_nonroot
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 3ea30a961..299572c84 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -15,14 +15,11 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="swapon"
-TS_DESC="label"
-
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="by label"
LABEL="testSwapLabel"
+. $TS_TOPDIR/functions.sh
ts_init "$*"
ts_skip_nonroot
diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index 3b181fa06..3a9c1318a 100755
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -15,12 +15,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="swapon"
-TS_DESC="uuid"
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="by uuid"
+. $TS_TOPDIR/functions.sh
ts_init "$*"
ts_skip_nonroot