diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 15:23:20 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-05-18 19:26:52 +0200 |
| commit | 0cca184f65b5397d9e52f32365ab962d5af2f7ea (patch) | |
| tree | 4496970adac77c2b11ebb5b7393d6764f38adc55 /t/ax/am-test-lib.sh | |
| parent | 9c468420a8ff18940ab2e9d47d096788ed5801f0 (diff) | |
| parent | 0256f1d66ff28cfcef895eb72b15e40e6de442e0 (diff) | |
| download | automake-0cca184f65b5397d9e52f32365ab962d5af2f7ea.tar.gz | |
Merge branch 'micro' into maint
* micro:
lisp: fix a failure with Solaris /usr/xpg4/bin/sh
tests: sanitize 'unset' usages
tests: fix some botched/outdated comments
tests: use perl, not find+rm, to remove temporary directories
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/ax/am-test-lib.sh')
| -rw-r--r-- | t/ax/am-test-lib.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh index 91a18ccc4..f35ccd5de 100644 --- a/t/ax/am-test-lib.sh +++ b/t/ax/am-test-lib.sh @@ -34,11 +34,6 @@ distdir=$me-1.0 ## Environment cleanup. ## ## ---------------------- ## -# Temporarily disable this, since some shells (e.g., older version -# of Bash) can return a non-zero exit status upon the when a non-set -# variable is unset. -set +e - # Unset some make-related variables that may cause $MAKE to act like # a recursively invoked sub-make. Any $MAKE invocation in a test is # conceptually an independent invocation, not part of the main @@ -85,9 +80,6 @@ for pfx in TEST_ SH_ TAP_ ''; do done unset pfx -# Re-enable, it had been temporarily disabled above. -set -e - # cross_compiling # --------------- # Tell whether we are cross-compiling. This is especially useful to skip @@ -805,7 +797,7 @@ process_requirements () *" $am_tool"*) . ./t/$am_tool-macros.dir/get.sh;; esac done - am_tool=; unset am_tool + unset am_tool } ## ---------------------------------------------------------------- ## |