From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 27 Jul 2012 08:32:58 +0000 (+0200)
Subject: [ng] vars: remove variable $(am__sh_e_setup)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0344626306dab5a8f5714c52740878371903a9d;p=thirdparty%2Fautomake.git

[ng] vars: remove variable $(am__sh_e_setup)

The comments to that variable claimed that "set +e" in the shell was
an XSI extension, but the Automake testsuite since at least 1.11 (which
was run several times with some weak, non-POSIX vendor /bin/sh) used it
in the test script, with not problem whatsoever.  So we don't actually
need the safety net provided by $(am__sh_e_setup): we can simply use
'set +e' in the relevant recipes.

* lib/am/header-vars.am (am__sh_e_setup): Remove.
* lib/am/parallel-tests.am: Remove usages; simply inline 'set +e' instead.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 2221c5bda..a27a8fba9 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -114,11 +114,6 @@ am__ensure_target_dir_exists = $(call am__ensure_dir_exists,$(@D))
 ## position it is declared in the output Makefile.
 .DEFAULT_GOAL := all
 
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-
 ## Emulate VPATH rewrites.  This uses only GNU make primitives, which
 ## allows us to avoid extra forks.
 am.vpath.rewrite = \
diff --git a/lib/am/parallel-tests.am b/lib/am/parallel-tests.am
index a31828144..07609d8f0 100644
--- a/lib/am/parallel-tests.am
+++ b/lib/am/parallel-tests.am
@@ -32,7 +32,6 @@ am__is_xfail_test = \
   $(if $(filter-out $(am__xfail_test_bases), \
                     $(patsubst $(srcdir)/%,%,$(1))),no,yes)
 am__runtest = \
-  $(am__sh_e_setup);							\
   $(am__tty_colors);							\
   srcdir=$(srcdir); export srcdir;					\
 ## Creates the directory for the log file if needed.  Avoid extra forks.
@@ -339,7 +338,7 @@ am.test-harness.append-to-list-of-bases = \
 
 $(TEST_SUITE_LOG): $(am__test_logs) $(am__test_results)
 	$(am.setup-test-harness-workdir)
-	@$(am__sh_e_setup); $(am__tty_colors); \
+	@set +e; $(am__tty_colors); \
 	fatal () { echo "fatal: making $@: $$*" >&2; exit 1; }; \
 	workdir='$(am.test-harness.workdir)'; \
 ## Detect a possible circular dependency, and error out if it's found.