mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
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.
This commit is contained in:
1 parent
28d1dc5251
commit
04fc32f7e0
5 files changed
+7
-11
No files matched your search
@@ -24,7 +24,7 @@ print_ver_ ginstall
|
||||
# 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
|
||||
|
||||
# Before 2004-04-21, install would infloop, in the 'while (wait...' loop:
|
||||
exec ginstall -s "$abs_top_builddir/src/ginstall$EXEEXT" .
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -24,13 +24,11 @@ touch -c no-file > /dev/null 2>&1 || fail=1
|
||||
touch -cm no-file > /dev/null 2>&1 || fail=1
|
||||
touch -ca no-file > /dev/null 2>&1 || fail=1
|
||||
|
||||
test="$abs_top_builddir/src/test"
|
||||
|
||||
# If >&- works, test "touch -c -" etc.
|
||||
# >&- apparently does not work in HP-UX 11.23.
|
||||
# This test is ineffective unless /dev/stdout also works.
|
||||
if "$test" -w /dev/stdout >/dev/null &&
|
||||
"$test" ! -w /dev/stdout >&-; then
|
||||
if env test -w /dev/stdout >/dev/null &&
|
||||
env test ! -w /dev/stdout >&-; then
|
||||
touch -c - >&- 2> /dev/null || fail=1
|
||||
touch -cm - >&- 2> /dev/null || fail=1
|
||||
touch -ca - >&- 2> /dev/null || fail=1
|
||||
|
||||
@@ -69,14 +69,12 @@ esac
|
||||
# Test interactions with -.
|
||||
touch -h - > file || fail=1
|
||||
|
||||
test="$abs_top_builddir/src/test"
|
||||
|
||||
# If >&- works, test "touch -ch -" etc.
|
||||
# >&- apparently does not work in HP-UX 11.23.
|
||||
# This test is ineffective unless /dev/stdout also works.
|
||||
# If stdout is open, it is not a symlink.
|
||||
if "$test" -w /dev/stdout >/dev/null &&
|
||||
"$test" ! -w /dev/stdout >&-; then
|
||||
if env test -w /dev/stdout >/dev/null &&
|
||||
env test ! -w /dev/stdout >&-; then
|
||||
touch -h - >&- && fail=1
|
||||
touch -h -c - >&- || fail=1
|
||||
fi
|
||||
|
||||
Reference in new issue
Block a user