summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger2007-07-17 22:47:43 +0200
committerKarel Zak2007-07-23 13:55:36 +0200
commitd6ca1ec176c38ba3e57246aabd55ce20b4e971cf (patch)
tree728b04507632f9065f09377c7ee77c975665b688
parentcytune: remove linux/tty.h inclusion (diff)
downloadkernel-qcow2-util-linux-d6ca1ec176c38ba3e57246aabd55ce20b4e971cf.tar.gz
kernel-qcow2-util-linux-d6ca1ec176c38ba3e57246aabd55ce20b4e971cf.tar.xz
kernel-qcow2-util-linux-d6ca1ec176c38ba3e57246aabd55ce20b4e971cf.zip
tests: use relative paths when sourcing files
The "." command will search $PATH before $PWD if the argument specified contains no path qualifiers which can cause problems if you happen to have something in $PATH named the same. The attached patch changes all of the ". <foo>" in the tests subdir. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rwxr-xr-xtests/run.sh2
-rwxr-xr-xtests/ts-cal-14
-rwxr-xr-xtests/ts-cal-34
-rwxr-xr-xtests/ts-cal-y4
-rwxr-xr-xtests/ts-col-multibyte4
-rwxr-xr-xtests/ts-cramfs-mkfs4
-rwxr-xr-xtests/ts-fstab-devname4
-rwxr-xr-xtests/ts-fstab-devname2label4
-rwxr-xr-xtests/ts-fstab-devname2uuid4
-rwxr-xr-xtests/ts-fstab-label4
-rwxr-xr-xtests/ts-fstab-label2devname4
-rwxr-xr-xtests/ts-fstab-label2uuid4
-rwxr-xr-xtests/ts-fstab-symlink4
-rwxr-xr-xtests/ts-fstab-uuid4
-rwxr-xr-xtests/ts-fstab-uuid2devname4
-rwxr-xr-xtests/ts-fstab-uuid2label4
-rwxr-xr-xtests/ts-hwclock-systohc4
-rwxr-xr-xtests/ts-ipcs-headers4
-rwxr-xr-xtests/ts-ipcs-limits6
-rwxr-xr-xtests/ts-ipcs-limits26
-rwxr-xr-xtests/ts-login-checktty4
-rwxr-xr-xtests/ts-look-separator4
-rwxr-xr-xtests/ts-mount-devname4
-rwxr-xr-xtests/ts-mount-label4
-rwxr-xr-xtests/ts-mount-move4
-rwxr-xr-xtests/ts-mount-mtablock4
-rwxr-xr-xtests/ts-mount-paths4
-rwxr-xr-xtests/ts-mount-remount4
-rwxr-xr-xtests/ts-mount-special4
-rwxr-xr-xtests/ts-mount-uuid4
-rwxr-xr-xtests/ts-namei-logic4
-rwxr-xr-xtests/ts-swapon-devname4
-rwxr-xr-xtests/ts-swapon-label4
-rwxr-xr-xtests/ts-swapon-uuid4
34 files changed, 69 insertions, 69 deletions
diff --git a/tests/run.sh b/tests/run.sh
index 51b7f7383..a731cc1b3 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-. commands.sh
+. ./commands.sh
echo
echo "------------------ Utils-linux-ng regression tests ------------------"
diff --git a/tests/ts-cal-1 b/tests/ts-cal-1
index 092420107..14aa269f5 100755
--- a/tests/ts-cal-1
+++ b/tests/ts-cal-1
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="cal"
TS_DESC="1 month"
diff --git a/tests/ts-cal-3 b/tests/ts-cal-3
index e8da56f82..6a6ad89d5 100755
--- a/tests/ts-cal-3
+++ b/tests/ts-cal-3
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="cal"
TS_DESC="3 months"
diff --git a/tests/ts-cal-y b/tests/ts-cal-y
index f9c60bd12..e70eb1520 100755
--- a/tests/ts-cal-y
+++ b/tests/ts-cal-y
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="cal"
TS_DESC="year"
diff --git a/tests/ts-col-multibyte b/tests/ts-col-multibyte
index 4ca11ccb9..cc478df04 100755
--- a/tests/ts-col-multibyte
+++ b/tests/ts-col-multibyte
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="col"
TS_DESC="multibyte"
diff --git a/tests/ts-cramfs-mkfs b/tests/ts-cramfs-mkfs
index 4d7ca23dd..173838263 100755
--- a/tests/ts-cramfs-mkfs
+++ b/tests/ts-cramfs-mkfs
@@ -17,8 +17,8 @@
# Test cramfs
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mkfs.cramfs"
TS_DESC="mkfs"
diff --git a/tests/ts-fstab-devname b/tests/ts-fstab-devname
index 64ab8e577..20fe24f2d 100755
--- a/tests/ts-fstab-devname
+++ b/tests/ts-fstab-devname
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="devname"
diff --git a/tests/ts-fstab-devname2label b/tests/ts-fstab-devname2label
index 96ce9acd3..40d83e014 100755
--- a/tests/ts-fstab-devname2label
+++ b/tests/ts-fstab-devname2label
@@ -19,8 +19,8 @@
# mount by devname -- with an LABEL in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="devname2label"
diff --git a/tests/ts-fstab-devname2uuid b/tests/ts-fstab-devname2uuid
index e81897e4c..ead5793fd 100755
--- a/tests/ts-fstab-devname2uuid
+++ b/tests/ts-fstab-devname2uuid
@@ -19,8 +19,8 @@
# mount by devname -- with an UUID in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="devname2uuid"
diff --git a/tests/ts-fstab-label b/tests/ts-fstab-label
index b6be12df6..97b068449 100755
--- a/tests/ts-fstab-label
+++ b/tests/ts-fstab-label
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="label"
diff --git a/tests/ts-fstab-label2devname b/tests/ts-fstab-label2devname
index 569e0a0dc..788b755df 100755
--- a/tests/ts-fstab-label2devname
+++ b/tests/ts-fstab-label2devname
@@ -19,8 +19,8 @@
# mount by LABEL -- with an devname in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="label2devname"
diff --git a/tests/ts-fstab-label2uuid b/tests/ts-fstab-label2uuid
index 9579a426d..1635b15ac 100755
--- a/tests/ts-fstab-label2uuid
+++ b/tests/ts-fstab-label2uuid
@@ -19,8 +19,8 @@
# mount by LABEL -- with an UUID in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="label2uuid"
diff --git a/tests/ts-fstab-symlink b/tests/ts-fstab-symlink
index d8174fd63..ab0573b1f 100755
--- a/tests/ts-fstab-symlink
+++ b/tests/ts-fstab-symlink
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="symlink"
diff --git a/tests/ts-fstab-uuid b/tests/ts-fstab-uuid
index f8a8d5c44..37e14d77a 100755
--- a/tests/ts-fstab-uuid
+++ b/tests/ts-fstab-uuid
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="uuid"
diff --git a/tests/ts-fstab-uuid2devname b/tests/ts-fstab-uuid2devname
index da0e03c0c..ba3c6d7f3 100755
--- a/tests/ts-fstab-uuid2devname
+++ b/tests/ts-fstab-uuid2devname
@@ -19,8 +19,8 @@
# mount by UUID -- with an devname in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="uuid2devname"
diff --git a/tests/ts-fstab-uuid2label b/tests/ts-fstab-uuid2label
index 7f4c0afe2..b82c77651 100755
--- a/tests/ts-fstab-uuid2label
+++ b/tests/ts-fstab-uuid2label
@@ -19,8 +19,8 @@
# mount by UUID -- with an LABEL in fstab
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="fstab"
TS_DESC="uuid2label"
diff --git a/tests/ts-hwclock-systohc b/tests/ts-hwclock-systohc
index 63758647d..56d600b72 100755
--- a/tests/ts-hwclock-systohc
+++ b/tests/ts-hwclock-systohc
@@ -17,8 +17,8 @@
# Test cramfs
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="hwclock"
TS_DESC="systohc"
diff --git a/tests/ts-ipcs-headers b/tests/ts-ipcs-headers
index 601bea808..f8dca77cd 100755
--- a/tests/ts-ipcs-headers
+++ b/tests/ts-ipcs-headers
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="ipcs"
TS_DESC="headers"
diff --git a/tests/ts-ipcs-limits b/tests/ts-ipcs-limits
index 33624de66..a6dcb93ea 100755
--- a/tests/ts-ipcs-limits
+++ b/tests/ts-ipcs-limits
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="ipcs"
TS_DESC="limits overflow"
@@ -11,7 +11,7 @@ if [ $UID != 0 ]; then
ts_skip_nonroot
fi
-. ts-ipcs.sh
+. ./ts-ipcs.sh
ts_init "$*"
diff --git a/tests/ts-ipcs-limits2 b/tests/ts-ipcs-limits2
index 1c8307f68..4ac0d6bf2 100755
--- a/tests/ts-ipcs-limits2
+++ b/tests/ts-ipcs-limits2
@@ -1,12 +1,12 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="ipcs"
TS_DESC="basic limits"
-. ts-ipcs.sh
+. ./ts-ipcs.sh
ts_init "$*"
diff --git a/tests/ts-login-checktty b/tests/ts-login-checktty
index f31efab31..8f375fb73 100755
--- a/tests/ts-login-checktty
+++ b/tests/ts-login-checktty
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="login"
TS_DESC="checktty"
diff --git a/tests/ts-look-separator b/tests/ts-look-separator
index 0a43df8d9..dfd1bb6d4 100755
--- a/tests/ts-look-separator
+++ b/tests/ts-look-separator
@@ -12,8 +12,8 @@
# uniq > words
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="look"
TS_DESC="separator"
diff --git a/tests/ts-mount-devname b/tests/ts-mount-devname
index cf7450cf0..2d96ea740 100755
--- a/tests/ts-mount-devname
+++ b/tests/ts-mount-devname
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="devname"
diff --git a/tests/ts-mount-label b/tests/ts-mount-label
index f5d0bef5c..39afd7e78 100755
--- a/tests/ts-mount-label
+++ b/tests/ts-mount-label
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="label"
diff --git a/tests/ts-mount-move b/tests/ts-mount-move
index 522b63437..badc58339 100755
--- a/tests/ts-mount-move
+++ b/tests/ts-mount-move
@@ -4,8 +4,8 @@
# test for mount --move and --bind
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="move "
diff --git a/tests/ts-mount-mtablock b/tests/ts-mount-mtablock
index edcf723ea..35bbda092 100755
--- a/tests/ts-mount-mtablock
+++ b/tests/ts-mount-mtablock
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="mtablock"
diff --git a/tests/ts-mount-paths b/tests/ts-mount-paths
index 7a8e9ff7d..2a9b63a26 100755
--- a/tests/ts-mount-paths
+++ b/tests/ts-mount-paths
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="basic paths"
diff --git a/tests/ts-mount-remount b/tests/ts-mount-remount
index 8a2e59edc..7ed344791 100755
--- a/tests/ts-mount-remount
+++ b/tests/ts-mount-remount
@@ -3,8 +3,8 @@
#
# test for mount -o remount,ro
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="remount"
diff --git a/tests/ts-mount-special b/tests/ts-mount-special
index aeffc2501..0e5206fa3 100755
--- a/tests/ts-mount-special
+++ b/tests/ts-mount-special
@@ -4,8 +4,8 @@
# test for /sbin/mount.<type> suuport
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="special program"
diff --git a/tests/ts-mount-uuid b/tests/ts-mount-uuid
index 64d934c63..84dbe05a6 100755
--- a/tests/ts-mount-uuid
+++ b/tests/ts-mount-uuid
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="mount"
TS_DESC="uuid"
diff --git a/tests/ts-namei-logic b/tests/ts-namei-logic
index 2c44c6015..2afdb3904 100755
--- a/tests/ts-namei-logic
+++ b/tests/ts-namei-logic
@@ -1,7 +1,7 @@
#!/bin/bash
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="namei"
TS_DESC="logic"
diff --git a/tests/ts-swapon-devname b/tests/ts-swapon-devname
index 4193fb002..4ec540d8d 100755
--- a/tests/ts-swapon-devname
+++ b/tests/ts-swapon-devname
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="swapon"
TS_DESC="devname"
diff --git a/tests/ts-swapon-label b/tests/ts-swapon-label
index 0f79340d7..0706ee9eb 100755
--- a/tests/ts-swapon-label
+++ b/tests/ts-swapon-label
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="swapon"
TS_DESC="label"
diff --git a/tests/ts-swapon-uuid b/tests/ts-swapon-uuid
index 14d79caf3..30f502104 100755
--- a/tests/ts-swapon-uuid
+++ b/tests/ts-swapon-uuid
@@ -15,8 +15,8 @@
# GNU General Public License for more details.
#
-. commands.sh
-. functions.sh
+. ./commands.sh
+. ./functions.sh
TS_COMPONENT="swapon"
TS_DESC="uuid"