Fix testsuite helper macros to not hide failure.

* tests/testsuite.at (LT_AT_CONFIGURE, LT_AT_MAKE):
Do not wrap AT_CHECK in a subshell, so that failures are
properly propagated; instead, move environment changes inside
the AT_CHECK code.
Report and analysis by Peter Rosin.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index f1a58fa7d535c7fe7b4cfa72df414634e2f8e25d..0ce3ca00324c746dd3ec5b6230a721234d824ca7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix testsuite helper macros to not hide failure.
+       * tests/testsuite.at (LT_AT_CONFIGURE, LT_AT_MAKE):
+       Do not wrap AT_CHECK in a subshell, so that failures are
+       properly propagated; instead, move environment changes inside
+       the AT_CHECK code.
+       Report and analysis by Peter Rosin.
+
        Avoid autom4te warning about unnamed diversion.
        * libltdl/config/getopt.m4sh: Use diversion name KILL not -1.
 

diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7f9afe90fc062d6527b689b5ca19fc42a8f05a26..71b9dc47a4bc5defce08c1e7a6fb7a9e87abb867 100644 (file)
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -151,21 +151,19 @@ AT_KEYWORDS([autoconf automake])
 # LT_AT_CONFIGURE([OPTIONS])
 # --------------------------
 m4_define([LT_AT_CONFIGURE],
-[( SHELL=${CONFIG_SHELL-/bin/sh}
-   AT_CHECK([CONFIG_SHELL=$SHELL $SHELL ./configure $configure_options $1],
-        [0], [ignore], [ignore])
- )
+[AT_CHECK([: ${CONFIG_SHELL=/bin/sh}; export CONFIG_SHELL; ]dnl
+         [$CONFIG_SHELL ./configure $configure_options $1],
+         [0], [ignore], [ignore])
 ])
 
 
 # LT_AT_MAKE([TGTS], [VARS])
 # --------------------------
 m4_define([LT_AT_MAKE],
-[( $unset LIBTOOL LIBTOOLIZE
-  for target in m4_default([$1], [all])
-  do
-    AT_CHECK([$MAKE $target $2], [0], [ignore], [ignore])
-  done )
+[for target in m4_default([$1], [all])
+do
+  AT_CHECK([$unset LIBTOOL LIBTOOLIZE; $MAKE $target $2], [0], [ignore], [ignore])
+done
 ])