diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-06-13 12:49:10 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-06-13 18:34:03 +0200 |
| commit | ef6e57b24b51f247119a83be6c81c6a8a30b87a4 (patch) | |
| tree | 8ab30db7ec4fbd383d127df2cbbaf199ece3b716 | |
| parent | 83e424e7319e8ef2e3398aefbaade972770a6f97 (diff) | |
| download | coreutils-ef6e57b24b51f247119a83be6c81c6a8a30b87a4.tar.xz | |
init.sh: sync from gnulib
* tests/init.sh: Sync recent changes from gnulib.
| -rw-r--r-- | tests/init.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/init.sh b/tests/init.sh index 14f2e26e0..60d1bc118 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -77,6 +77,7 @@ Exit () { set +e; (exit $1); exit $1; } warn_ () { echo "$@" 1>&$stderr_fileno_; } fail_ () { warn_ "$ME_: failed test: $@"; Exit 1; } skip_ () { warn_ "$ME_: skipped test: $@"; Exit 77; } +fatal_ () { warn_ "$ME_: hard error: $@"; Exit 99; } framework_failure_ () { warn_ "$ME_: set-up failure: $@"; Exit 99; } # Sanitize this shell to POSIX mode, if possible. @@ -167,7 +168,10 @@ else st_=$? # $re_shell_ works just fine. Use it. - test $st_ = 10 && break + if test $st_ = 10; then + gl_set_x_corrupts_stderr_=false + break + fi # If this is our first marginally acceptable shell, remember it. if test "$st_:$marginal_" = 9: ; then @@ -400,7 +404,7 @@ mktempd_ () { case $# in 2);; - *) fail_ "Usage: $ME DIR TEMPLATE";; + *) fail_ "Usage: mktempd_ DIR TEMPLATE";; esac destdir_=$1 |