--- a/components/autoconf/Makefile Tue Nov 29 10:10:20 2016 +0100
+++ b/components/autoconf/Makefile Tue Nov 29 07:49:46 2016 -0800
@@ -33,6 +33,7 @@
TPNO= 22294
+SYSTEM_TEST_TARGET= build $(SYSTEM_TEST_NO_ARCH)
include $(WS_MAKE_RULES)/gnu-component.mk
# with ksh93 as the configure shell, all tests pass
@@ -42,6 +43,23 @@
CONFIGURE_OPTIONS += PERL="$(PERL)"
CONFIGURE_OPTIONS += M4="$(GNUBIN)/m4"
+# The Makefile has different targets for the equivalent of "gmake test" and
+# "gmake system-test".
+COMPONENT_TEST_TARGETS = check-local
+COMPONENT_TEST_DIR = $(@D)/tests
+COMPONENT_TEST_ENV += F77=/usr/bin/gfortran
+
+COMPONENT_SYSTEM_TEST_TARGETS = installcheck
+COMPONENT_SYSTEM_TEST_DIR = $(@D)/tests
+COMPONENT_SYSTEM_TEST_ENV += F77=/usr/bin/gfortran
+
+COMPONENT_TEST_TRANSFORMS += \
+ '-e "/check-local/d"' \
+ '-e "/ksh93/d"' \
+ '-e "/Entering directory/d"' \
+ '-e "/Leaving directory/d"' \
+ '-e "/^make/d"'
+
REQUIRED_PACKAGES += developer/macro/gnu-m4
REQUIRED_PACKAGES += $(PERL_PKG)
REQUIRED_PACKAGES += shell/ksh93
--- a/components/autoconf/test/results-32.master Tue Nov 29 10:10:20 2016 +0100
+++ b/components/autoconf/test/results-32.master Tue Nov 29 07:49:46 2016 -0800
@@ -1,67 +1,3 @@
-make[1]: Entering directory '$(@D)'
-if test -d $(SOURCE_DIR)/.git; then \
- cd $(SOURCE_DIR) && \
- git submodule --quiet foreach test '$(git rev-parse $sha1)' \
- = '$(git merge-base origin $sha1)' \
- || { echo 'maint.mk: found non-public submodule commit' >&2; \
- exit 1; }; \
-else \
- : ; \
-fi
-/usr/gnu/bin/make check-recursive
-make[2]: Entering directory '$(@D)'
-Making check in bin
-make[3]: Entering directory '$(@D)/bin'
-make[3]: Nothing to be done for 'check'.
-make[3]: Leaving directory '$(@D)/bin'
-Making check in .
-make[3]: Entering directory '$(@D)'
-make[3]: Nothing to be done for 'check-am'.
-make[3]: Leaving directory '$(@D)'
-Making check in lib
-make[3]: Entering directory '$(@D)/lib'
-Making check in Autom4te
-make[4]: Entering directory '$(@D)/lib/Autom4te'
-make[4]: Nothing to be done for 'check'.
-make[4]: Leaving directory '$(@D)/lib/Autom4te'
-Making check in m4sugar
-make[4]: Entering directory '$(@D)/lib/m4sugar'
-/usr/gnu/bin/make check-local
-make[5]: Entering directory '$(@D)/lib/m4sugar'
-make[5]: Leaving directory '$(@D)/lib/m4sugar'
-make[4]: Leaving directory '$(@D)/lib/m4sugar'
-Making check in autoconf
-make[4]: Entering directory '$(@D)/lib/autoconf'
-/usr/gnu/bin/make check-local
-make[5]: Entering directory '$(@D)/lib/autoconf'
-make[5]: Leaving directory '$(@D)/lib/autoconf'
-make[4]: Leaving directory '$(@D)/lib/autoconf'
-Making check in autotest
-make[4]: Entering directory '$(@D)/lib/autotest'
-/usr/gnu/bin/make check-local
-make[5]: Entering directory '$(@D)/lib/autotest'
-make[5]: Leaving directory '$(@D)/lib/autotest'
-make[4]: Leaving directory '$(@D)/lib/autotest'
-Making check in autoscan
-make[4]: Entering directory '$(@D)/lib/autoscan'
-make[4]: Nothing to be done for 'check'.
-make[4]: Leaving directory '$(@D)/lib/autoscan'
-Making check in emacs
-make[4]: Entering directory '$(@D)/lib/emacs'
-make[4]: Nothing to be done for 'check'.
-make[4]: Leaving directory '$(@D)/lib/emacs'
-make[4]: Entering directory '$(@D)/lib'
-make[4]: Nothing to be done for 'check-am'.
-make[4]: Leaving directory '$(@D)/lib'
-make[3]: Leaving directory '$(@D)/lib'
-Making check in doc
-make[3]: Entering directory '$(@D)/doc'
-make[3]: Nothing to be done for 'check'.
-make[3]: Leaving directory '$(@D)/doc'
-Making check in tests
-make[3]: Entering directory '$(@D)/tests'
-/usr/gnu/bin/make check-local
-make[4]: Entering directory '$(@D)/tests'
:;{ \
echo '# Signature of the current package.' && \
echo 'm4_define([AT_PACKAGE_NAME], [GNU Autoconf])' && \
@@ -73,12 +9,8 @@
} > package.m4-t
mv package.m4-t package.m4
cd ../lib/autotest && /usr/gnu/bin/make autotest.m4f
-make[5]: Entering directory '$(@D)/lib/autotest'
-make[5]: 'autotest.m4f' is up to date.
-make[5]: Leaving directory '$(@D)/lib/autotest'
autom4te_perllibdir='$(SOURCE_DIR)'/lib AUTOM4TE_CFG='../lib/autom4te.cfg' ../bin/autom4te -B '..'/lib -B '$(SOURCE_DIR)'/lib --language=autotest -I . -I $(SOURCE_DIR)/tests suite.at -o testsuite.tmp
mv testsuite.tmp testsuite
-/bin/ksh93 ./testsuite
## ----------------------------- ##
## GNU Autoconf 2.69 test suite. ##
## ----------------------------- ##
@@ -426,7 +358,7 @@
307: GNU Fortran 77 ok
308: GNU Fortran ok
-309: AC_OPENMP and Fortran 77 skipped (fortran.at:114)
+309: AC_OPENMP and Fortran 77 ok
310: AC_OPENMP and Fortran ok
311: AC_F77_DUMMY_MAIN usage ok
312: AC_FC_DUMMY_MAIN usage ok
@@ -446,7 +378,7 @@
Testing autoconf/fortran macros.
-326: AC_F77_IMPLICIT_NONE skipped (acfortran.at:13)
+326: AC_F77_IMPLICIT_NONE ok
327: AC_F77_MAIN ok
328: AC_F77_WRAPPERS ok
329: AC_FC_CHECK_BOUNDS ok
@@ -671,13 +603,5 @@
## Test results. ##
## ------------- ##
-487 tests behaved as expected.
-16 tests were skipped.
-make[4]: Leaving directory '$(@D)/tests'
-make[3]: Leaving directory '$(@D)/tests'
-Making check in man
-make[3]: Entering directory '$(@D)/man'
-make[3]: Nothing to be done for 'check'.
-make[3]: Leaving directory '$(@D)/man'
-make[2]: Leaving directory '$(@D)'
-make[1]: Leaving directory '$(@D)'
+489 tests behaved as expected.
+14 tests were skipped.