summaryrefslogtreecommitdiff
path: root/t/ax/am-test-lib.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/ax/am-test-lib.sh')
-rw-r--r--t/ax/am-test-lib.sh10
1 files changed, 1 insertions, 9 deletions
diff --git a/t/ax/am-test-lib.sh b/t/ax/am-test-lib.sh
index 8214315fb..9120336fa 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
@@ -677,7 +669,7 @@ process_requirements ()
*" $am_tool"*) . ./t/$am_tool-macros.dir/get.sh;;
esac
done
- am_tool=; unset am_tool
+ unset am_tool
}
## ---------------------------------------------------------------- ##