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>

diff --git a/tests/run.sh b/tests/run.sh
index 51b7f738376a62292df29c187da4cc0b6546e19a..a731cc1b3c011b477daea1d6a5b6f2948ca961b9 100755 (executable)
--- 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 092420107cd425f9bbd3d1556b436628b7582d30..14aa269f518a57aaa4138444ff991ec6790c13d8 100755 (executable)
--- 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 e8da56f8277c247b0dce44109a85a0c9129da066..6a6ad89d54499ba803a4c53ee1cf67127972d716 100755 (executable)
--- 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 f9c60bd12971bf05b6f9183f2925416a16ff2a25..e70eb152054d2bb228ae137193dda916ebd4ff1a 100755 (executable)
--- 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 4ca11ccb99e095e5f403007c6043f0017c6b4b48..cc478df04761abf0c75664a3eb6f0162a9f35042 100755 (executable)
--- 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 4d7ca23dd2c217951cfbaa9b478c53a98e2e7ca9..173838263f3b2908993cc2e6de83de8f3b604628 100755 (executable)
--- 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 64ab8e57711c3aafb020463b2e187602b73c5108..20fe24f2dc5b2fb68595cb543c976fc8fdd9c620 100755 (executable)
--- 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 96ce9acd38a448f2d0171e48753f0a98fd79262e..40d83e014649d72a03782b60677b2e36d900ed8e 100755 (executable)
--- 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 e81897e4c4c4d1decaaf7b6097fb4e8b48caba35..ead5793fd34bdb009502c22b4cd3fb3c9c7f7926 100755 (executable)
--- 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 b6be12df6326de6af94efca7fcde5e472659007b..97b0684490b798022e337a4a813c55c8361f2076 100755 (executable)
--- 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 569e0a0dc30257d34afe4f2313714e91d4d69f3f..788b755df825b3d90e62120feb5ac7cf79ca6271 100755 (executable)
--- 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 9579a426dbe21f1abc437cbe4c6347d0e456f3cb..1635b15ac8ca5422c376061eb2fe763c64f1c78a 100755 (executable)
--- 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 d8174fd63df45a76e44fa3488a4368d99dfdaca1..ab0573b1ff3737f68caac6a02d06c771458ebed2 100755 (executable)
--- 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 f8a8d5c44aad88568d42dd049fb10c64fea73efb..37e14d77a116763314daadfbb120e5861ff4b5dd 100755 (executable)
--- 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 da0e03c0c595d126aaf0f96b09c11527fc6c4438..ba3c6d7f37b61c4142879da3e949042e28ec2782 100755 (executable)
--- 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 7f4c0afe27a8b31bc98251b0994552c02ca3bc4f..b82c77651d197336c2399ece09f63cff2c24baff 100755 (executable)
--- 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 63758647d871b2b752f04f7a8304f3ee8a277c69..56d600b72c129f0d1d2af34eea689c45781fe793 100755 (executable)
--- 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 601bea8086bc477a37bce1531a15c9b3250a6603..f8dca77cd1090ff006068b285d2d30a5c43d794f 100755 (executable)
--- 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 33624de66c161613ab5242666b71230a8537d84f..a6dcb93ea3a609de781f0e929035b6968c61f251 100755 (executable)
--- 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 1c8307f68c8e3f3eca399d90f76474b07787c715..4ac0d6bf2b0bc66198241c1890fb171209ce09df 100755 (executable)
--- 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 f31efab314847b81771bfd8a3ea6176a16ca7efe..8f375fb73e7885a1e587e42b6531cdded535c54c 100755 (executable)
--- 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 0a43df8d99baf95a10d605861722a9d8a7a2e77f..dfd1bb6d4fac7625be64510c576056ef8c34693e 100755 (executable)
--- 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 cf7450cf0b8b8ab4aca1ea2723cb9f2e0baf307e..2d96ea7404ade5650258ca34ba2c7366d45c5c26 100755 (executable)
--- 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 f5d0bef5cd855636299388c09a81e9beeb9393da..39afd7e78ef71caf8db60378b7c07302ebff5a23 100755 (executable)
--- 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 522b63437ef4cfccf0458ce81b4ffdc6a3f926c5..badc583395449ab84331aceb0f1512b5fff7e5d0 100755 (executable)
--- 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 edcf723eaf4cd4955ae74feefb560714ce0ef8f6..35bbda0923630e218ccdc9f95b58260c9928ad13 100755 (executable)
--- 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 7a8e9ff7d3769a5e97131dec6b8671dd03f42a3f..2a9b63a26c4f2b885876d794761d8b7b6c7407a4 100755 (executable)
--- 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 8a2e59edc3fdce7fbb8f2d978496720a5f952a99..7ed344791b6daec62f45e75a6a922fa8c71d402b 100755 (executable)
--- 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 aeffc25014dcd656a4f7804b6883852500a5d351..0e5206fa33fab686e30411ad3d8c305934c0b991 100755 (executable)
--- 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 64d934c6360edbaa12f1b1ff152f8b675936dd20..84dbe05a619b396b153cbfaeb10eb3707947a94e 100755 (executable)
--- 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 2c44c6015c7d48a08209bb5b2fc1dcc4c874f749..2afdb3904a76bdc29a290d3e4f0bb8fd40c7b9d2 100755 (executable)
--- 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 4193fb002092a25dc89d35f1212e4f23b4ea6183..4ec540d8da4168cdc821852919e36f57b8e752ec 100755 (executable)
--- 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 0f79340d7c4162971dd68f74c5478ab567a3acba..0706ee9ebd97a2172a9ad888494c9c4a8d6b8f7b 100755 (executable)
--- 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 14d79caf3cc4452fe2b8b77cb4ed229f26b4caa3..30f5021041ba6901f91d8cd858db486aa75f2ac3 100755 (executable)
--- 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"