diff options
author | Jim Meyering <meyering@redhat.com> | 2012-04-03 20:32:44 +0200 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2012-04-04 12:20:56 +0200 |
commit | e43d30eab3215bc9ff49ec7db3d3e2baa95ba070 (patch) | |
tree | b3828ca5bdc794f9b8648af1996d2863663c8590 /tests/misc/stty | |
parent | 64ecea53d9b4c1ecbf6d02ff8c4ae98b3a82e9a2 (diff) | |
download | coreutils-e43d30eab3215bc9ff49ec7db3d3e2baa95ba070.tar.xz |
tests: convert nearly all `...` expressions to $(...)
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
Diffstat (limited to 'tests/misc/stty')
-rwxr-xr-x | tests/misc/stty | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/misc/stty b/tests/misc/stty index 650231f16..97020e8fe 100755 --- a/tests/misc/stty +++ b/tests/misc/stty @@ -40,7 +40,7 @@ REV_cbreak=1 REV_decctlq=1 REV_tabs=1 REV_lcase=1 REV_LCASE=1 saved_state=.saved-state stty --save > $saved_state || fail=1 -stty `cat $saved_state` || fail=1 +stty $(cat $saved_state) || fail=1 # This would segfault prior to sh-utils-2.0j. stty erase - || fail=1 @@ -54,7 +54,7 @@ stty -raw -a 2>/dev/null && fail=1 # Don't depend on terminal width. Put each option on its own line, # remove all non-boolean ones, then remove any leading hyphens. sed_del='/^speed/d;/^rows/d;/^columns/d;/ = /d' -options=`stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g"` +options=$(stty -a | tr -s ';' '\n' | sed "s/^ //;$sed_del;s/-//g") # Take them one at a time, with and without the leading '-'. for opt in $options; do @@ -70,7 +70,7 @@ for opt in $options; do # Likewise, 'stty -cread' would fail, so skip that, too. test $opt = cread && continue - rev=`eval echo "\\\$REV_$opt"` + rev=$(eval echo "\$REV_$opt") if test -n "$rev"; then stty -$opt || { fail=1; echo -$opt; } fi @@ -84,8 +84,8 @@ if test -n "$RUN_LONG_TESTS"; then stty $opt1 $opt2 || fail=1 - rev1=`eval echo "\\\$REV_$opt1"` - rev2=`eval echo "\\\$REV_$opt2"` + rev1=$(eval echo "\$REV_$opt1") + rev2=$(eval echo "\$REV_$opt2") if test -n "$rev1"; then stty -$opt1 $opt2 || fail=1 fi @@ -99,6 +99,6 @@ if test -n "$RUN_LONG_TESTS"; then done fi -stty `cat $saved_state` +stty $(cat $saved_state) Exit $fail |