mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-03-30 00:35:18 +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
57 lines
1.4 KiB
Bash
Executable File
57 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
# Test "rm -ir".
|
|
|
|
# Copyright (C) 1997-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_ rm
|
|
|
|
t=t
|
|
mkdir -p $t $t/a $t/b $t/c || framework_failure_
|
|
> $t/a/a || framework_failure_
|
|
> $t/b/bb || framework_failure_
|
|
> $t/c/cc || framework_failure_
|
|
|
|
cat <<EOF > in
|
|
y
|
|
y
|
|
y
|
|
y
|
|
y
|
|
y
|
|
y
|
|
y
|
|
n
|
|
n
|
|
n
|
|
EOF
|
|
|
|
# Remove all but one of a, b, c -- I doubt that this test can portably
|
|
# determine which one was removed based on order of dir entries.
|
|
# This is a good argument for switching to a dejagnu-style test suite.
|
|
rm --verbose -i -r $t < in > /dev/null 2>&1 || fail=1
|
|
|
|
# $t should not have been removed.
|
|
test -d $t || fail=1
|
|
|
|
# There should be only one directory left.
|
|
case $(echo $t/*) in
|
|
$t/[abc]) ;;
|
|
*) fail=1 ;;
|
|
esac
|
|
|
|
Exit $fail
|