Mercurial > hg > octave-nkf > gnulib-hg
changeset 16228:4adb73653ffa
init.sh: don't waste a subshell just to redirect stderr
* tests/init.sh: In testing for diff -u and diff -c, use a
stderr-redirecting exec inside `...` rather than a subshell.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Thu, 05 Jan 2012 16:45:50 +0100 |
| parents | 57418c6cd32b |
| children | daac1ca4c436 |
| files | ChangeLog tests/init.sh |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-01-05 Jim Meyering <meyering@redhat.com> + init.sh: don't waste a subshell just to redirect stderr + * tests/init.sh: In testing for diff -u and diff -c, use a + stderr-redirecting exec inside `...` rather than a subshell. + test-init.sh: avoid failure on HP-UX 11.00 * tests/test-init.sh: Skip "diff -u"-comparing step when compare resolves to diff -c or cmp. Reported by Bruno Haible.
--- a/tests/init.sh +++ b/tests/init.sh @@ -255,7 +255,7 @@ return 2 } -if diff_out_=`( diff -u "$0" "$0" < /dev/null ) 2>/dev/null`; then +if diff_out_=`exec 2>/dev/null; diff -u "$0" "$0" < /dev/null`; then if test -z "$diff_out_"; then compare_ () { diff -u "$@"; } else @@ -273,7 +273,7 @@ fi } fi -elif diff_out_=`( diff -c "$0" "$0" < /dev/null ) 2>/dev/null`; then +elif diff_out_=`exec 2>/dev/null; diff -c "$0" "$0" < /dev/null`; then if test -z "$diff_out_"; then compare_ () { diff -c "$@"; } else