mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-23 15:45:00 +02:00
e43d30eab3
Exempt init.sh because it runs before we're assured to have a
shell that groks $(...). Exempt *.mk because "$" would have to
be doubled, and besides, any `...` expression in a .mk file is
almost certainly evaluated before init.sh is run. Finally, also
exempt the perl-based tests, because perl's `...` cannot be
converted to $(...). Do that by running this command:
git grep -l '`.*`' tests \
| grep -Ev 'init\.sh|\.mk$' | xargs grep -Lw perl \
| xargs perl -pi -e 's/`(.*?)`/\$($1)/g'
One minor fix-up change was required after that, due to how
quoting differs:
diff --git a/tests/chmod/equals b/tests/chmod/equals
- expected_perms=$(eval 'echo \$expected_'$dest)
+ expected_perms=$(eval 'echo $expected_'$dest)
Another was to make these required quoting adjustments:
diff --git a/tests/misc/stty b/tests/misc/stty
...
- rev=$(eval echo "\\\$REV_$opt")
+ rev=$(eval echo "\$REV_$opt")
...
- rev1=$(eval echo "\\\$REV_$opt1")
- rev2=$(eval echo "\\\$REV_$opt2")
+ rev1=$(eval echo "\$REV_$opt1")
+ rev2=$(eval echo "\$REV_$opt2")
Also, transform two files that were needlessly excluded above:
(both use perl, but are mostly bourne shell)
perl -pi -e 's/`(.*?)`/\$($1)/g' \
tests/du/long-from-unreadable tests/init.cfg
60 lines
1.7 KiB
Bash
Executable File
60 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
# Validate timeout basic operation
|
|
|
|
# Copyright (C) 2008-2012 Free Software Foundation, Inc.
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
. "${srcdir=.}/init.sh"; path_prepend_ ../src
|
|
print_ver_ timeout
|
|
|
|
# no timeout
|
|
timeout 10 true || fail=1
|
|
|
|
# no timeout (suffix check)
|
|
timeout 1d true || fail=1
|
|
|
|
# disabled timeout
|
|
timeout 0 true || fail=1
|
|
|
|
# exit status propagation
|
|
timeout 10 sh -c 'exit 2'
|
|
test $? = 2 || fail=1
|
|
|
|
# timeout
|
|
timeout 1 sleep 10
|
|
test $? = 124 || fail=1
|
|
|
|
# kill delay. Note once the initial timeout triggers,
|
|
# the exit status will be 124 even if the command
|
|
# exits on its own accord.
|
|
timeout -s0 -k1 1 sleep 10
|
|
test $? = 124 && fail=1
|
|
|
|
# Ensure 'timeout' is immune to parent's SIGCHLD handler
|
|
# 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
|
|
|
|
exec timeout 10 true
|
|
) || fail=1
|
|
|
|
# Don't be confused when starting off with a child (Bug#9098).
|
|
out=$(sleep 1 & exec timeout 2 sh -c 'sleep 3; echo foo')
|
|
status=$?
|
|
test "$out" = "" && test $status = 124 || fail=1
|
|
|
|
Exit $fail
|