From 00a309823501317f9061a28e98cc13177bc4a12a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 27 May 2008 13:45:44 +0200 Subject: in 280+ tests/* files, use $srcdir, not $top_srcdir/tests --- tests/misc/arch | 2 +- tests/misc/cat-proc | 2 +- tests/misc/chcon | 2 +- tests/misc/chcon-fail | 2 +- tests/misc/close-stdout | 2 +- tests/misc/csplit | 2 +- tests/misc/date-sec | 2 +- tests/misc/df | 2 +- tests/misc/df-P | 2 +- tests/misc/false-status | 2 +- tests/misc/fmt-long-line | 2 +- tests/misc/groups-dash | 2 +- tests/misc/groups-version | 2 +- tests/misc/head-c | 2 +- tests/misc/head-pos | 2 +- tests/misc/help-version | 2 +- tests/misc/id-context | 2 +- tests/misc/ls-time | 2 +- tests/misc/mknod | 2 +- tests/misc/nice | 2 +- tests/misc/nl | 2 +- tests/misc/nohup | 2 +- tests/misc/od-N | 2 +- tests/misc/od-x8 | 2 +- tests/misc/pathchk1 | 2 +- tests/misc/printf | 2 +- tests/misc/printf-hex | 2 +- tests/misc/printf-surprise | 2 +- tests/misc/ptx-overrun | 2 +- tests/misc/pwd-long | 4 ++-- tests/misc/pwd-unreadable-parent | 2 +- tests/misc/readlink-fp-loop | 2 +- tests/misc/runcon-no-reorder | 2 +- tests/misc/selinux | 2 +- tests/misc/shred-exact | 2 +- tests/misc/shred-remove | 2 +- tests/misc/shuf | 2 +- tests/misc/sort-compress | 2 +- tests/misc/sort-rand | 2 +- tests/misc/split-a | 2 +- tests/misc/split-fail | 2 +- tests/misc/split-l | 2 +- tests/misc/stat-fmt | 2 +- tests/misc/stty | 4 ++-- tests/misc/stty-invalid | 4 ++-- tests/misc/stty-row-col | 4 ++-- tests/misc/sum-sysv | 4 ++-- tests/misc/tac-continue | 2 +- tests/misc/tee | 2 +- tests/misc/tee-dash | 2 +- tests/misc/wc-files0 | 2 +- 51 files changed, 56 insertions(+), 56 deletions(-) (limited to 'tests/misc') diff --git a/tests/misc/arch b/tests/misc/arch index 3a510b6de..1661d6c60 100755 --- a/tests/misc/arch +++ b/tests/misc/arch @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # skip this test if arch isn't being built. case " $built_programs " in diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc index 0d7b07ed5..8fa3f56ac 100755 --- a/tests/misc/cat-proc +++ b/tests/misc/cat-proc @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then cat --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh f=/proc/cpuinfo diff --git a/tests/misc/chcon b/tests/misc/chcon index d7a9c5f31..f8caadae2 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -6,7 +6,7 @@ if test "$VERBOSE" = yes; then chcon --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh require_root_ require_selinux_ skip_if_mcstransd_is_running_ diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail index 5c67276ce..d9bac7c85 100755 --- a/tests/misc/chcon-fail +++ b/tests/misc/chcon-fail @@ -7,7 +7,7 @@ if test "$VERBOSE" = yes; then chcon --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout index c3f54da7d..ede75205f 100755 --- a/tests/misc/close-stdout +++ b/tests/misc/close-stdout @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh p="$abs_top_builddir" diff --git a/tests/misc/csplit b/tests/misc/csplit index 3d681fd21..9997860e1 100755 --- a/tests/misc/csplit +++ b/tests/misc/csplit @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then csplit --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/date-sec b/tests/misc/date-sec index 6d7a8bccb..dea183513 100755 --- a/tests/misc/date-sec +++ b/tests/misc/date-sec @@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then date --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/df b/tests/misc/df index fe8dabb4a..bb895e7fa 100755 --- a/tests/misc/df +++ b/tests/misc/df @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then df --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh case `df .` in *' diff --git a/tests/misc/df-P b/tests/misc/df-P index 7669550e1..8024864ce 100755 --- a/tests/misc/df-P +++ b/tests/misc/df-P @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then df --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/false-status b/tests/misc/false-status index 7eaec30ce..67191a3fe 100755 --- a/tests/misc/false-status +++ b/tests/misc/false-status @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then false --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 false --version > /dev/null && fail=1 diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line index 05e03467e..690202338 100755 --- a/tests/misc/fmt-long-line +++ b/tests/misc/fmt-long-line @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then fmt --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash index 62bf1a4e8..bc132d804 100755 --- a/tests/misc/groups-dash +++ b/tests/misc/groups-dash @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then groups --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # Coreutils 6.9 and earlier failed to display information on first argument # if later argument was --. diff --git a/tests/misc/groups-version b/tests/misc/groups-version index 12e16c3f0..34dbd3307 100755 --- a/tests/misc/groups-version +++ b/tests/misc/groups-version @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then groups --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh require_built_ groups id fail=0 diff --git a/tests/misc/head-c b/tests/misc/head-c index 7610533b7..2b348d2e3 100755 --- a/tests/misc/head-c +++ b/tests/misc/head-c @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then head --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh echo abc > in || framework_failure diff --git a/tests/misc/head-pos b/tests/misc/head-pos index 90efe2279..0c55a879b 100755 --- a/tests/misc/head-pos +++ b/tests/misc/head-pos @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then head --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh (echo a; echo b) > in || framework_failure diff --git a/tests/misc/help-version b/tests/misc/help-version index 77e54c7b4..1dcf96f92 100755 --- a/tests/misc/help-version +++ b/tests/misc/help-version @@ -25,7 +25,7 @@ test "$VERBOSE" = yes && set -x test "x$SHELL" = x && SHELL=/bin/sh export SHELL -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh expected_failure_status_nohup=127 expected_failure_status_printenv=2 diff --git a/tests/misc/id-context b/tests/misc/id-context index 5dca74493..ea90ec676 100755 --- a/tests/misc/id-context +++ b/tests/misc/id-context @@ -20,7 +20,7 @@ if test "$VERBOSE" = yes; then id --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # Require selinux - when selinux is disabled, id never prints scontext. require_selinux_ diff --git a/tests/misc/ls-time b/tests/misc/ls-time index 69f597938..07271c601 100755 --- a/tests/misc/ls-time +++ b/tests/misc/ls-time @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # Avoid any possible glitches due to daylight-saving changes near the # time stamps used during the test. diff --git a/tests/misc/mknod b/tests/misc/mknod index bcaf98bf3..bb8e02480 100755 --- a/tests/misc/mknod +++ b/tests/misc/mknod @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then mknod --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/nice b/tests/misc/nice index f4d40121a..4fcb80fad 100755 --- a/tests/misc/nice +++ b/tests/misc/nice @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then nice --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh tests=' 0 empty 10 diff --git a/tests/misc/nl b/tests/misc/nl index 58baef9c3..572e44a33 100755 --- a/tests/misc/nl +++ b/tests/misc/nl @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then nl --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/nohup b/tests/misc/nohup index dc90f48f1..1b36dbd29 100755 --- a/tests/misc/nohup +++ b/tests/misc/nohup @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then nohup --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/od-N b/tests/misc/od-N index 0213dc4ee..884127ceb 100755 --- a/tests/misc/od-N +++ b/tests/misc/od-N @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then od --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh echo abcdefg > in || framework_failure diff --git a/tests/misc/od-x8 b/tests/misc/od-x8 index 267ab4d87..b52c1ce38 100755 --- a/tests/misc/od-x8 +++ b/tests/misc/od-x8 @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then od --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh od -t x8 /dev/null >/dev/null || skip_test_ "od lacks support for 8-byte quantities" diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1 index 3bc5869fd..5b20f077a 100755 --- a/tests/misc/pathchk1 +++ b/tests/misc/pathchk1 @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then pathchk --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh skip_if_root_ touch file || framework_failure diff --git a/tests/misc/printf b/tests/misc/printf index bdcfb5d2f..78084b3b0 100755 --- a/tests/misc/printf +++ b/tests/misc/printf @@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then "$prog" --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex index e5db45e4d..968f66726 100755 --- a/tests/misc/printf-hex +++ b/tests/misc/printf-hex @@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then "$prog" --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise index 90a29973f..dd3c332bb 100755 --- a/tests/misc/printf-surprise +++ b/tests/misc/printf-surprise @@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then env $prog --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh require_ulimit_ fail=0 diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun index 552d7e2c4..185969118 100755 --- a/tests/misc/ptx-overrun +++ b/tests/misc/ptx-overrun @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then ptx --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # Using a long file name makes an abort more likely. # Even with no file name, valgrind detects the buffer overrun. diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index a8aff7016..94d4e4c03 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -18,9 +18,9 @@ # along with this program. If not, see . : ${srcdir=.} -. $top_srcdir/tests/require-perl +. $srcdir/require-perl -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh require_readable_root_ ARGV_0=$0 diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent index 165cd79a1..75df827f2 100755 --- a/tests/misc/pwd-unreadable-parent +++ b/tests/misc/pwd-unreadable-parent @@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh test $host_os != linux-gnu && skip_test_ 'vendor getcwd may be inadequate' diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop index 99c1ec073..7ac54b9a9 100755 --- a/tests/misc/readlink-fp-loop +++ b/tests/misc/readlink-fp-loop @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then readlink --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh cwd=$("$abs_top_builddir/src/pwd") # To trigger this bug, we have to construct a name/situation during diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder index 77637a30a..07dd08116 100755 --- a/tests/misc/runcon-no-reorder +++ b/tests/misc/runcon-no-reorder @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then runcon --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh cat <<\EOF > exp || framework_failure runcon: runcon may be used only on a SELinux kernel diff --git a/tests/misc/selinux b/tests/misc/selinux index 87b3af250..8065182f5 100755 --- a/tests/misc/selinux +++ b/tests/misc/selinux @@ -10,7 +10,7 @@ if test "$VERBOSE" = yes; then stat --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh require_root_ require_selinux_ skip_if_mcstransd_is_running_ diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact index ea465902f..d90a80e03 100755 --- a/tests/misc/shred-exact +++ b/tests/misc/shred-exact @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then shred --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove index f69166a9d..a5dc6f12d 100755 --- a/tests/misc/shred-remove +++ b/tests/misc/shred-remove @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then shred --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh skip_if_root_ # The length of the basename is what matters. diff --git a/tests/misc/shuf b/tests/misc/shuf index 2231dcd53..97109498f 100755 --- a/tests/misc/shuf +++ b/tests/misc/shuf @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then shuf --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh seq 100 > in || framework_failure diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress index a555b26df..f3c473597 100755 --- a/tests/misc/sort-compress +++ b/tests/misc/sort-compress @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then sort --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh seq -w 2000 > exp || framework_failure tac exp > in || framework_failure diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand index c42d16f5a..f675c956c 100755 --- a/tests/misc/sort-rand +++ b/tests/misc/sort-rand @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then sort --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh seq 100 > in || framework_failure diff --git a/tests/misc/split-a b/tests/misc/split-a index cde48559e..b39009942 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then split --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z' diff --git a/tests/misc/split-fail b/tests/misc/split-fail index d15dd9244..0334c2d14 100755 --- a/tests/misc/split-fail +++ b/tests/misc/split-fail @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then split --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh touch in || framework_failure diff --git a/tests/misc/split-l b/tests/misc/split-l index f2f23835f..453f1008f 100755 --- a/tests/misc/split-l +++ b/tests/misc/split-l @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then ln --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh printf '1\n2\n3\n4\n5\n' > in || framework_failure diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt index e19fb1271..f169166b1 100755 --- a/tests/misc/stat-fmt +++ b/tests/misc/stat-fmt @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then stat --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/stty b/tests/misc/stty index 8c4815b2d..8b5fbff00 100755 --- a/tests/misc/stty +++ b/tests/misc/stty @@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then fi # Make sure there's a tty on stdin. -. $top_srcdir/tests/input-tty -. $top_srcdir/tests/test-lib.sh +. $srcdir/input-tty +. $srcdir/test-lib.sh # The following list of reversible options was generated with # grep -w REV stty.c|sed -n '/^ {"/{s//REV_/;s/".*/=1/;p;}'|fmt diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid index d478765ed..168bb59af 100755 --- a/tests/misc/stty-invalid +++ b/tests/misc/stty-invalid @@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then fi # Make sure there's a tty on stdin. -. $top_srcdir/tests/input-tty -. $top_srcdir/tests/test-lib.sh +. $srcdir/input-tty +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col index d5d751070..7fc917fa4 100755 --- a/tests/misc/stty-row-col +++ b/tests/misc/stty-row-col @@ -37,8 +37,8 @@ LC_ALL=C export LC_ALL # Make sure there's a tty on stdin. -. $top_srcdir/tests/input-tty -. $top_srcdir/tests/test-lib.sh +. $srcdir/input-tty +. $srcdir/test-lib.sh # Versions of GNU stty from shellutils-1.9.2c and earlier failed # tests #2 and #4 when run on SunOS 4.1.3. diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv index e5361832d..8766449ef 100755 --- a/tests/misc/sum-sysv +++ b/tests/misc/sum-sysv @@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then fi : ${srcdir=.} -. $top_srcdir/tests/require-perl +. $srcdir/require-perl # Avoid a problem when run in a UTF-8 locale. # Otherwise, Perl would try to (and fail to) interpret @@ -30,7 +30,7 @@ fi LC_ALL=C export LC_ALL -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue index c8da320e1..ce41a525c 100755 --- a/tests/misc/tac-continue +++ b/tests/misc/tac-continue @@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then tac --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh # See if the envvar is defined. if test x = "x$FULL_PARTITION_TMPDIR"; then diff --git a/tests/misc/tee b/tests/misc/tee index e73619fdf..adf0caa0b 100755 --- a/tests/misc/tee +++ b/tests/misc/tee @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then tee --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh echo line >sample || framework_failure nums=`seq 9` || framework_failure diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash index 7b330f97c..2564117f1 100755 --- a/tests/misc/tee-dash +++ b/tests/misc/tee-dash @@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then tee --version fi -. $top_srcdir/tests/test-lib.sh +. $srcdir/test-lib.sh fail=0 tee - 2b || framework_failure echo 2 words > 2w || framework_failure -- cgit v1.2.3-54-g00ecf