From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Mon, 7 May 2012 18:28:09 +0000 (+0200)
Subject: [ng] check: minor refactoring (prefer make time over recipe time)
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c0400ed8aae7fda77ecacd2d51771a7692dd16e;p=thirdparty%2Fautomake.git

[ng] check: minor refactoring (prefer make time over recipe time)

No semantic change intended.

* lib/am/check2.am [%?FIRST%] (am__is_xfail_test): New internal helper
function.
(am__runtest): Use that, the $(if) built-in, and a minor reorganization
to shave off few lines of code, and to favor processing by make over
processing by the shell.

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

diff --git a/lib/am/check2.am b/lib/am/check2.am
index b0f5b33ee..34fdd5827 100644
--- a/lib/am/check2.am
+++ b/lib/am/check2.am
@@ -15,39 +15,32 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 if %?FIRST%
+
+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 if needed.
   test x$(@D) = x. || test -d $(@D) || $(MKDIR_P) $(@D) || exit $$?;	\
-  f='$(patsubst $(srcdir)/%,%,$<)';					\
 ## We need to invoke the test in way that won't cause a PATH search.
 ## Quotes around '$<' are required to avoid extra errors when a circular
 ## dependency is detected (e.g., because $(TEST_SUITE_LOG) is in
 ## $(am__test_logs)), because in that case '$<' expands to empty and an
 ## unquote usage of it could cause syntax errors in the shell.
   case '$<' in */*) tst='$<';; *) tst=./'$<';; esac;			\
-  if test -n '$(DISABLE_HARD_ERRORS)'; then				\
-    am__enable_hard_errors=no; 						\
-  else									\
-    am__enable_hard_errors=yes; 					\
-  fi; 									\
-  f2='$(patsubst $(srcdir)/%,%,$*)';					\
-  case " $(am__xfail_test_bases) " in					\
-    *" $$f2 "*) am__expect_failure=yes;;				\
-             *) am__expect_failure=no;;					\
-  esac; 								\
 ## Executes the developer-defined and user-defined test
 ## setups (if any), in that order.
   $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)				\
   $($(1)LOG_DRIVER)							\
-  --test-name "$$f" 							\
+  --test-name '$(patsubst $(srcdir)/%,%,$<)'				\
   --log-file $*.log							\
   --trs-file $*.trs							\
   --color-tests "$$am__color_tests"					\
-  --enable-hard-errors "$$am__enable_hard_errors"			\
-  --expect-failure "$$am__expect_failure"				\
+  --enable-hard-errors $(if $(DISABLE_HARD_ERRORS),no,yes)		\
+  --expect-failure $(call am__is_xfail_test,$*)				\
   $(AM_$(1)LOG_DRIVER_FLAGS)						\
   $($(1)LOG_DRIVER_FLAGS)						\
   --									\
@@ -56,6 +49,7 @@ am__runtest = \
   $($(1)LOG_FLAGS)							\
   "$$tst"								\
   $(AM_TESTS_FD_REDIRECT)
+
 endif %?FIRST%
 
 ## From a test file to a .log and .trs file.