diff options
| author | Jim Meyering <meyering@fb.com> | 2014-07-01 09:40:50 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-07-02 09:07:26 -0700 |
| commit | 04fc32f7e038e92e033c770211749be683c74973 (patch) | |
| tree | f700df8b05061ca8eb845185dd2f057812f6b8fc /tests/misc | |
| parent | 28d1dc525182c347f2346c52fa7b5ab4a9b1a148 (diff) | |
| download | coreutils-04fc32f7e038e92e033c770211749be683c74973.tar.xz | |
tests: use "env builtin" in place of "$abs_top_builddir/src/builtin"
This works for any program that might also be a shell built-in.
It is more concise. In addition, it makes output more reproducible:
some diagnostics include argv[0], which will now be just the program
name, rather than the full absolute name of the executable.
* tests/misc/sort-compress.sh: Use env kill, rather than absolute name.
* tests/install/trap.sh: Likewise.
* tests/misc/timeout.sh: Likewise.
* tests/touch/no-dereference.sh: Do the same for two uses of "test".
* tests/touch/no-create-missing.sh: Likewise.
Diffstat (limited to 'tests/misc')
| -rwxr-xr-x | tests/misc/sort-compress.sh | 2 | ||||
| -rwxr-xr-x | tests/misc/timeout.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/misc/sort-compress.sh b/tests/misc/sort-compress.sh index 75ab8bd1e..8f215b8b9 100755 --- a/tests/misc/sort-compress.sh +++ b/tests/misc/sort-compress.sh @@ -39,7 +39,7 @@ chmod +x gzip # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh. ( # ash doesn't support "trap '' CHLD"; it knows only signal numbers. - sig=$("$abs_top_builddir/src/kill" -l CHLD 2>/dev/null) && trap '' $sig + sig=$(env kill -l CHLD 2>/dev/null) && trap '' $sig # This should force the use of child processes for "compression" PATH=.:$PATH exec sort -S 1k --compress-program=gzip in > /dev/null diff --git a/tests/misc/timeout.sh b/tests/misc/timeout.sh index 247c2fc4c..8eaeef958 100755 --- a/tests/misc/timeout.sh +++ b/tests/misc/timeout.sh @@ -51,7 +51,7 @@ test $? = 124 && fail=1 # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh. ( # ash doesn't support "trap '' CHLD"; it knows only signal numbers. - sig=$("$abs_top_builddir/src/kill" -l CHLD 2>/dev/null) && trap '' $sig + sig=$(env kill -l CHLD 2>/dev/null) && trap '' $sig exec timeout 10 true ) || fail=1 |