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@xxxxxxxxxx> --- diff --git a/tests/run.sh b/tests/run.sh index 51b7f73..a731cc1 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 0924201..14aa269 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 e8da56f..6a6ad89 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 f9c60bd..e70eb15 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 4ca11cc..cc478df 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 4d7ca23..1738382 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 64ab8e5..20fe24f 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 96ce9ac..40d83e0 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 e81897e..ead5793 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 b6be12d..97b0684 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 569e0a0..788b755 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 9579a42..1635b15 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 d8174fd..ab0573b 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 f8a8d5c..37e14d7 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 da0e03c..ba3c6d7 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 7f4c0af..b82c776 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 6375864..56d600b 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 601bea8..f8dca77 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 33624de..a6dcb93 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 1c8307f..4ac0d6b 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 f31efab..8f375fb 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 0a43df8..dfd1bb6 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 cf7450c..2d96ea7 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 f5d0bef..39afd7e 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 522b634..badc583 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 edcf723..35bbda0 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 7a8e9ff..2a9b63a 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 8a2e59e..7ed3447 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 aeffc25..0e5206f 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 64d934c..84dbe05 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 2c44c60..2afdb39 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 4193fb0..4ec540d 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 0f79340..0706ee9 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 14d79ca..30f5021 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" - To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
