mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-04-01 17:53:41 +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
49 lines
1.8 KiB
Bash
Executable File
49 lines
1.8 KiB
Bash
Executable File
#!/bin/sh
|
|
# prior to coreutils-4.5.3, du -D didn't work in some cases
|
|
# Based on an example from Andreas Schwab and/or Michal Svec.
|
|
# Also, up to coreutils-8.5, du -L sometimes incorrectly
|
|
# counted the space of the followed symlinks.
|
|
|
|
# Copyright (C) 2002-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_ du
|
|
|
|
mkdir -p a/sub || framework_failure_
|
|
ln -s a/sub slink || framework_failure_
|
|
touch b || framework_failure_
|
|
ln -s .. a/sub/dotdot || framework_failure_
|
|
ln -s nowhere dangle || framework_failure_
|
|
|
|
|
|
# This used to fail with the following diagnostic:
|
|
# du: 'b': No such file or directory
|
|
du -sD slink b > /dev/null 2>&1 || fail=1
|
|
|
|
# This used to fail to report the dangling symlink.
|
|
du -L dangle > /dev/null 2>&1 && fail=1
|
|
|
|
# du -L used to mess up, either by counting the symlink's disk space itself
|
|
# (-L should follow symlinks, not count their space)
|
|
# or (briefly in July 2010) by omitting the entry for "a".
|
|
du_L_output=$(du -L a) || fail=1
|
|
du_lL_output=$(du -lL a) || fail=1
|
|
du_x_output=$(du --exclude=dotdot a) || fail=1
|
|
test "X$du_L_output" = "X$du_x_output" || fail=1
|
|
test "X$du_lL_output" = "X$du_x_output" || fail=1
|
|
|
|
Exit $fail
|