tests: pass all arguments to ts_init, add ts_has_option function

This patch:
	- replaces "$1" with "$*" for ts_init function
	- add ts_has_option function
	- removes some tailing white-spaces

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/commands.sh.in b/tests/commands.sh.in
index 26c7779182ec61859ba676523d292308a2144e1d..86f3d11ad96618f52b28a0a19ede93fc5a335d4e 100644 (file)
--- a/tests/commands.sh.in
+++ b/tests/commands.sh.in
@@ -3,6 +3,7 @@ TS_TOPDIR=$TOPDIR/tests
 
 # helpers
 TS_HELPER_SYSINFO="$TS_TOPDIR/helpers/mnt_test_sysinfo"
+TS_HELPER_LIBPRELOAD_TIME="$TS_TOPDIR/helpers/.libs/libpreload-time.so"
 
 # external commands
 TS_ECMD_BLKID="@BLKID@"
@@ -26,8 +27,11 @@ TS_CMD_COL=${TS_CMD_COL:-"$TOPDIR/text-utils/col"}
 
 TS_CMD_NAMEI=${TS_CMD_NAMEI-"$TOPDIR/misc-utils/namei"}
 TS_CMD_LOOK=${TS_CMD_LOOK-"$TOPDIR/misc-utils/look"}
+TS_CMD_CAL=${TS_CMD_CAL-"$TOPDIR/misc-utils/cal"}
 
 TS_CMD_CHECKTTY=${TS_CMD_CHECKTTY-"$TOPDIR/login-utils/checktty_test"}
 
 TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$TOPDIR/hwclock/hwclock"}
 
+
+

diff --git a/tests/functions.sh b/tests/functions.sh
index ed435092c4a26d642ddf63ab34d26322aa53b715..a33b885bcb701304c2ec1e0867a870364dbcf7a5 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -42,6 +42,12 @@ function ts_log {
        [ "$TS_VERBOSE" == "yes" ] && echo "$1"
 }
 
+function ts_has_option {
+       NAME="$1"
+       ALL="$2"
+       echo -n $ALL | sed 's/ //g' | gawk 'BEGIN { FS="="; RS="--" } /('$NAME'$|'$NAME'=)/ { print "yes" }'
+}
+
 function ts_init {
        export LANG="en_US.UTF-8":
        TS_NAME=$(basename $0)
@@ -51,7 +57,8 @@ function ts_init {
        if [ ! -d $TS_DIFFDIR ]; then
                mkdir -p $TS_DIFFDIR
        fi
-       [ "$1" == "--verbose" ] && TS_VERBOSE="yes"
+
+       TS_VERBOSE=$( ts_has_option "verbose" "$*")
        TS_OUTPUT="$TS_OUTDIR/$TS_NAME"
        TS_DIFF="$TS_DIFFDIR/$TS_NAME"
        TS_EXPECTED="$TS_EXPECTEDDIR/$TS_NAME"

diff --git a/tests/ts-col-multibyte b/tests/ts-col-multibyte
index 00ebb2b3af644e54bd07898dd83f283beeccd413..4ca11ccb99e095e5f403007c6043f0017c6b4b48 100755 (executable)
--- a/tests/ts-col-multibyte
+++ b/tests/ts-col-multibyte
@@ -6,7 +6,7 @@
 TS_COMPONENT="col"
 TS_DESC="multibyte"
 
-ts_init "$1"
+ts_init "$*"
 
 cat $TS_INPUT | $TS_CMD_COL > /dev/null  2> $TS_OUTPUT
 

diff --git a/tests/ts-cramfs-mkfs b/tests/ts-cramfs-mkfs
index c2d6c131a8f389100109dcd6acb47d8eb5966877..4d7ca23dd2c217951cfbaa9b478c53a98e2e7ca9 100755 (executable)
--- a/tests/ts-cramfs-mkfs
+++ b/tests/ts-cramfs-mkfs
@@ -23,7 +23,7 @@
 TS_COMPONENT="mkfs.cramfs"
 TS_DESC="mkfs"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-devname b/tests/ts-fstab-devname
index 30e2414ac35dc9f7a6e2816e93364337e1f7bbc6..64ab8e57711c3aafb020463b2e187602b73c5108 100755 (executable)
--- a/tests/ts-fstab-devname
+++ b/tests/ts-fstab-devname
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="fstab"
 TS_DESC="devname"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-devname2label b/tests/ts-fstab-devname2label
index 9b7926badc5b1233023e1e1a778298308f5a78b6..96ce9acd38a448f2d0171e48753f0a98fd79262e 100755 (executable)
--- a/tests/ts-fstab-devname2label
+++ b/tests/ts-fstab-devname2label
@@ -27,7 +27,7 @@ TS_DESC="devname2label"
 
 LABEL="testMountD2L"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-devname2uuid b/tests/ts-fstab-devname2uuid
index 602ab59f1194630d1051786f58b600733853623b..e81897e4c4c4d1decaaf7b6097fb4e8b48caba35 100755 (executable)
--- a/tests/ts-fstab-devname2uuid
+++ b/tests/ts-fstab-devname2uuid
@@ -25,7 +25,7 @@
 TS_COMPONENT="fstab"
 TS_DESC="devname2uuid"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-label b/tests/ts-fstab-label
index 8edb342fb44dbf744f3575f788df1273586ca185..b6be12df6326de6af94efca7fcde5e472659007b 100755 (executable)
--- a/tests/ts-fstab-label
+++ b/tests/ts-fstab-label
@@ -23,7 +23,7 @@ TS_DESC="label"
 
 LABEL="testFstabLabel"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
@@ -31,7 +31,7 @@ set -o pipefail
 DEVICE=$(ts_device_init)
 [ "$?" == 0 ] || ts_die "Cannot init device"
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null 
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 
 ts_device_has "LABEL" $LABEL $DEVICE

diff --git a/tests/ts-fstab-label2devname b/tests/ts-fstab-label2devname
index 92497c59331e156133d913c6b1bdfcfa0c7b422f..569e0a0dc30257d34afe4f2313714e91d4d69f3f 100755 (executable)
--- a/tests/ts-fstab-label2devname
+++ b/tests/ts-fstab-label2devname
@@ -27,7 +27,7 @@ TS_DESC="label2devname"
 
 LABEL="testMountL2D"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-label2uuid b/tests/ts-fstab-label2uuid
index 5467b46026154ef26a46cbd56fccba2c99910543..9579a426dbe21f1abc437cbe4c6347d0e456f3cb 100755 (executable)
--- a/tests/ts-fstab-label2uuid
+++ b/tests/ts-fstab-label2uuid
@@ -27,7 +27,7 @@ TS_DESC="label2uuid"
 
 LABEL="testMountL2U"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-uuid b/tests/ts-fstab-uuid
index 0cd7f4dbbbb904f76ebd8f90dd4d5d8b8af8602c..f8a8d5c44aad88568d42dd049fb10c64fea73efb 100755 (executable)
--- a/tests/ts-fstab-uuid
+++ b/tests/ts-fstab-uuid
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="fstab"
 TS_DESC="uuid"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
@@ -29,7 +29,7 @@ set -o pipefail
 DEVICE=$(ts_device_init)
 [ "$?" == 0 ] || ts_die "Cannot init device"
 
-mkfs.ext3 $DEVICE &> /dev/null 
+mkfs.ext3 $DEVICE &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 
 ts_device_has_uuid $DEVICE

diff --git a/tests/ts-fstab-uuid2devname b/tests/ts-fstab-uuid2devname
index 5316234901ac137465d2483db7f082ea506df9a8..da0e03c0c595d126aaf0f96b09c11527fc6c4438 100755 (executable)
--- a/tests/ts-fstab-uuid2devname
+++ b/tests/ts-fstab-uuid2devname
@@ -25,7 +25,7 @@
 TS_COMPONENT="fstab"
 TS_DESC="uuid2devname"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-fstab-uuid2label b/tests/ts-fstab-uuid2label
index 9fa4f6cf68bc188b5570c0b9cd7300a5d68e6174..7f4c0afe27a8b31bc98251b0994552c02ca3bc4f 100755 (executable)
--- a/tests/ts-fstab-uuid2label
+++ b/tests/ts-fstab-uuid2label
@@ -27,7 +27,7 @@ TS_DESC="uuid2label"
 
 LABEL="testMountU2L"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-hwclock-systohc b/tests/ts-hwclock-systohc
index 2bbe9ce1c0ee29aadc3b7fd34029ddbc60a40fe5..63758647d871b2b752f04f7a8304f3ee8a277c69 100755 (executable)
--- a/tests/ts-hwclock-systohc
+++ b/tests/ts-hwclock-systohc
@@ -25,7 +25,7 @@ TS_DESC="systohc"
 
 NTP_SERVER="0.fedora.pool.ntp.org"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 [ -x "/usr/sbin/ntpdate" ] || ts_skip "cannot found ntpdate command"

diff --git a/tests/ts-ipcs-headers b/tests/ts-ipcs-headers
index b8728d6c9c9d8f4f399f99426a2970b3558643bc..601bea8086bc477a37bce1531a15c9b3250a6603 100755 (executable)
--- a/tests/ts-ipcs-headers
+++ b/tests/ts-ipcs-headers
@@ -6,7 +6,7 @@
 TS_COMPONENT="ipcs"
 TS_DESC="headers"
 
-ts_init "$1"
+ts_init "$*"
 
 ts_log "test: shm headers"
 $TS_CMD_IPCS -m -t | grep --after-context=1 "^---"  >> $TS_OUTPUT

diff --git a/tests/ts-ipcs-limits b/tests/ts-ipcs-limits
index 98656b6850d95a1a39983b4eefc59977db67625c..33624de66c161613ab5242666b71230a8537d84f 100755 (executable)
--- a/tests/ts-ipcs-limits
+++ b/tests/ts-ipcs-limits
@@ -7,19 +7,19 @@ TS_COMPONENT="ipcs"
 TS_DESC="limits overflow"
 
 if [ $UID != 0 ]; then
-       ts_init "$1"
+       ts_init "$*"
        ts_skip_nonroot
 fi
 
 . ts-ipcs.sh
 
-ts_init "$1"
+ts_init "$*"
 
 ts_log "load original values"
 for i in $IPCS_IDX; do
        SHM_ORG[$i]=$(cat ${IPCS_PROCFILES[$i]})
 done >> $TS_OUTPUT
-               
+
 ts_log "check for difference between kernel and IPC"
 ipcs_limits_check >> $TS_OUTPUT
 

diff --git a/tests/ts-ipcs-limits2 b/tests/ts-ipcs-limits2
index 05256f97bce804b89ebf984c207741fca8ba710d..1c8307f68c8e3f3eca399d90f76474b07787c715 100755 (executable)
--- a/tests/ts-ipcs-limits2
+++ b/tests/ts-ipcs-limits2
@@ -8,7 +8,7 @@ TS_DESC="basic limits"
 
 . ts-ipcs.sh
 
-ts_init "$1"
+ts_init "$*"
 
 ts_log "check for difference between kernel and IPC"
 ipcs_limits_check >> $TS_OUTPUT

diff --git a/tests/ts-login-checktty b/tests/ts-login-checktty
index a79b02d0a49cc22d681e79ca4ff01021eaac9b88..f31efab314847b81771bfd8a3ea6176a16ca7efe 100755 (executable)
--- a/tests/ts-login-checktty
+++ b/tests/ts-login-checktty
@@ -6,7 +6,7 @@
 TS_COMPONENT="login"
 TS_DESC="checktty"
 
-ts_init "$1"
+ts_init "$*"
 $TS_CMD_CHECKTTY  >> $TS_OUTPUT
 ts_finalize
 

diff --git a/tests/ts-look-separator b/tests/ts-look-separator
index c6f6ed4c683df638317580c6b0b8ade7b9ce4877..0a43df8d99baf95a10d605861722a9d8a7a2e77f 100755 (executable)
--- a/tests/ts-look-separator
+++ b/tests/ts-look-separator
@@ -18,7 +18,7 @@
 TS_COMPONENT="look"
 TS_DESC="separator"
 
-ts_init "$1"
+ts_init "$*"
 
 [ -f "/usr/share/dict/words" ] || ts_skip "/usr/share/dict/words not such file"
 

diff --git a/tests/ts-mount-devname b/tests/ts-mount-devname
index a2ebb332e3797f5ad7a4423e0de75a0f40c4f23c..cf7450cf0b8b8ab4aca1ea2723cb9f2e0baf307e 100755 (executable)
--- a/tests/ts-mount-devname
+++ b/tests/ts-mount-devname
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="mount"
 TS_DESC="devname"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
@@ -29,7 +29,7 @@ set -o pipefail
 DEVICE=$(ts_device_init)
 [ "$?" == 0 ] || ts_die "Cannot init device"
 
-mkfs.ext3 $DEVICE &> /dev/null 
+mkfs.ext3 $DEVICE &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 
 ts_device_has "TYPE" "ext3" $DEVICE

diff --git a/tests/ts-mount-label b/tests/ts-mount-label
index 2861d531ea4de233356d55cf703db40c0aa03934..f5d0bef5cd855636299388c09a81e9beeb9393da 100755 (executable)
--- a/tests/ts-mount-label
+++ b/tests/ts-mount-label
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -23,7 +23,7 @@ TS_DESC="label"
 
 LABEL="testMountLabel"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
@@ -31,7 +31,7 @@ set -o pipefail
 DEVICE=$(ts_device_init)
 [ "$?" == 0 ] || ts_die "Cannot init device"
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null 
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 
 ts_device_has "LABEL" $LABEL $DEVICE

diff --git a/tests/ts-mount-move b/tests/ts-mount-move
index 3b182658a768dbdbc60a64561097ae990ef3d17b..522b63437ef4cfccf0458ce81b4ffdc6a3f926c5 100755 (executable)
--- a/tests/ts-mount-move
+++ b/tests/ts-mount-move
@@ -10,7 +10,7 @@
 TS_COMPONENT="mount"
 TS_DESC="move "
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 PWD=$(pwd)

diff --git a/tests/ts-mount-mtablock b/tests/ts-mount-mtablock
index 87f807700f44271ceeda55e38eaf8f1414de0f49..edcf723eaf4cd4955ae74feefb560714ce0ef8f6 100755 (executable)
--- a/tests/ts-mount-mtablock
+++ b/tests/ts-mount-mtablock
@@ -6,7 +6,7 @@
 TS_COMPONENT="mount"
 TS_DESC="mtablock"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 #

diff --git a/tests/ts-mount-paths b/tests/ts-mount-paths
index fe3ef920d35196b97d5db67a786cecb84f5740a6..7a8e9ff7d3769a5e97131dec6b8671dd03f42a3f 100755 (executable)
--- a/tests/ts-mount-paths
+++ b/tests/ts-mount-paths
@@ -6,7 +6,7 @@
 TS_COMPONENT="mount"
 TS_DESC="basic paths"
 
-ts_init "$1"
+ts_init "$*"
 
 $TS_CMD_MOUNT -n -f -v -v -v /dev/dummy /mnt &> $TS_OUTPUT
 

diff --git a/tests/ts-mount-remount b/tests/ts-mount-remount
index b293572a4a59078a2eb51e86e8189ccb97245958..8a2e59edc3fdce7fbb8f2d978496720a5f952a99 100755 (executable)
--- a/tests/ts-mount-remount
+++ b/tests/ts-mount-remount
@@ -9,7 +9,7 @@
 TS_COMPONENT="mount"
 TS_DESC="remount"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 # mountpoint

diff --git a/tests/ts-mount-special b/tests/ts-mount-special
index bcdec248f640d46ac788f1ccef234cbd60d5c3f5..aeffc25014dcd656a4f7804b6883852500a5d351 100755 (executable)
--- a/tests/ts-mount-special
+++ b/tests/ts-mount-special
@@ -12,11 +12,11 @@ TS_DESC="special program"
 
 MOUNTER="/sbin/mount.mytest"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 cat > $MOUNTER << EOF
-#!/bin/bash 
+#!/bin/bash
 # This util-linux-ng regression test component
 # It's safe to remove me...
 #

diff --git a/tests/ts-mount-uuid b/tests/ts-mount-uuid
index cb004e917fa56720760dd8c51006b25e94a976b4..64d934c6360edbaa12f1b1ff152f8b675936dd20 100755 (executable)
--- a/tests/ts-mount-uuid
+++ b/tests/ts-mount-uuid
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="mount"
 TS_DESC="uuid"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
@@ -29,7 +29,7 @@ set -o pipefail
 DEVICE=$(ts_device_init)
 [ "$?" == 0 ] || ts_die "Cannot init device"
 
-mkfs.ext3 $DEVICE &> /dev/null 
+mkfs.ext3 $DEVICE &> /dev/null
 [ "$?" == "0" ] || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
 
 ts_device_has_uuid $DEVICE

diff --git a/tests/ts-namei-logic b/tests/ts-namei-logic
index 0a4693c468cd7d0fcf500fdb5dc70e089da4ca52..2c44c6015c7d48a08209bb5b2fc1dcc4c874f749 100755 (executable)
--- a/tests/ts-namei-logic
+++ b/tests/ts-namei-logic
@@ -6,7 +6,7 @@
 TS_COMPONENT="namei"
 TS_DESC="logic"
 
-ts_init "$1"
+ts_init "$*"
 
 SANDBOX="$TS_OUTDIR/namei"
 

diff --git a/tests/ts-swapon-devname b/tests/ts-swapon-devname
index f8552a6e33139cb0cb7a1cb829519af7a44881aa..4193fb002092a25dc89d35f1212e4f23b4ea6183 100755 (executable)
--- a/tests/ts-swapon-devname
+++ b/tests/ts-swapon-devname
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="swapon"
 TS_DESC="devname"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-swapon-label b/tests/ts-swapon-label
index 0d7dc93a8f18734579c7851ab06c7b6987b86364..0f79340d7c4162971dd68f74c5478ab567a3acba 100755 (executable)
--- a/tests/ts-swapon-label
+++ b/tests/ts-swapon-label
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -23,7 +23,7 @@ TS_DESC="label"
 
 LABEL="testSwapLabel"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail

diff --git a/tests/ts-swapon-uuid b/tests/ts-swapon-uuid
index 6e2a90faed901fb50b8726346cb631f2e0646247..14d79caf3cc4452fe2b8b77cb4ed229f26b4caa3 100755 (executable)
--- a/tests/ts-swapon-uuid
+++ b/tests/ts-swapon-uuid
@@ -1,14 +1,14 @@
 #!/bin/bash
 
-# 
+#
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-# 
+#
 # This file is part of util-linux-ng.
-# 
+#
 # 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
 # the Free Software Foundation; either version 2 of the License.
-# 
+#
 # This file is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -21,7 +21,7 @@
 TS_COMPONENT="swapon"
 TS_DESC="uuid"
 
-ts_init "$1"
+ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail