Author: ngie
Date: Sun Oct 25 22:23:04 2015
New Revision: 289953
URL: https://svnweb.freebsd.org/changeset/base/289953
Log:
MFC r284405:
Remove ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support from atf.test.mk
The legacy atf tools were removed in atf 0.20
Modified:
stable/10/UPDATING
stable/10/share/mk/atf.test.mk
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING Sun Oct 25 22:21:19 2015 (r289952)
+++ stable/10/UPDATING Sun Oct 25 22:23:04 2015 (r289953)
@@ -16,6 +16,12 @@ from older versions of FreeBSD, try WITH
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
+20151025:
+ ALLOW_DEPRECATED_ATF_TOOLS/ATFFILE support has been removed from
+ atf.test.mk (included from bsd.test.mk). Please upgrade devel/atf
+ and devel/kyua to version 0.20+ and adjust any calling code to work
+ with Kyuafile and kyua.
+
20150823:
The polarity of Pulse Per Second (PPS) capture events with the
uart(4) driver has been corrected. Prior to this change the PPS
Modified: stable/10/share/mk/atf.test.mk
==============================================================================
--- stable/10/share/mk/atf.test.mk Sun Oct 25 22:21:19 2015
(r289952)
+++ stable/10/share/mk/atf.test.mk Sun Oct 25 22:23:04 2015
(r289953)
@@ -22,28 +22,10 @@ ATF_TESTS_C?=
ATF_TESTS_CXX?=
ATF_TESTS_SH?=
-# Whether to allow using the deprecated ATF tools or not.
-#
-# If 'yes', this file will generate Atffiles when requested and will also
-# support using the deprecated atf-run tool to execute the tests.
-ALLOW_DEPRECATED_ATF_TOOLS?= no
-
-# Knob to control the handling of the Atffile for this Makefile.
-#
-# If 'yes', an Atffile exists in the source tree and is installed into
-# TESTSDIR.
-#
-# If 'auto', an Atffile is automatically generated based on the list of test
-# programs built by the Makefile and is installed into TESTSDIR. This is the
-# default and is sufficient in the majority of the cases.
-#
-# If 'no', no Atffile is installed.
-ATFFILE?= auto
-
# Path to the prefix of the installed ATF tools, if any.
#
# If atf-run and atf-report are installed from ports, we automatically define a
-# realtest target below to run the tests using these tools. The tools are
+# realregress target below to run the tests using these tools. The tools are
# searched for in the hierarchy specified by this variable.
ATF_PREFIX?= /usr/local
@@ -115,67 +97,3 @@ ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
mv ${.TARGET}.tmp ${.TARGET}
.endfor
.endif
-
-.if ${ALLOW_DEPRECATED_ATF_TOOLS} != "no"
-
-.if ${ATFFILE:tl} != "no"
-FILES+= Atffile
-FILESDIR_Atffile= ${TESTSDIR}
-
-.if ${ATFFILE:tl} == "auto"
-CLEANFILES+= Atffile Atffile.tmp
-
-Atffile: Makefile
- @{ echo 'Content-Type: application/X-atf-atffile; version="1"'; \
- echo; \
- echo '# Automatically generated by atf-test.mk.'; \
- echo; \
- echo 'prop: test-suite = "'${TESTSUITE}'"'; \
- echo; \
- for tp in ${ATF_TESTS_C} ${ATF_TESTS_CXX} ${ATF_TESTS_SH} \
- ${TESTS_SUBDIRS}; \
- do \
- echo "tp: $${tp}"; \
- done; } >Atffile.tmp
- @mv Atffile.tmp Atffile
-.endif
-.endif
-
-ATF_REPORT?= ${ATF_PREFIX}/bin/atf-report
-ATF_RUN?= ${ATF_PREFIX}/bin/atf-run
-.if exists(${ATF_RUN}) && exists(${ATF_REPORT})
-# Definition of the "make test" target and supporting variables.
-#
-# This target, by necessity, can only work for native builds (i.e. a freeBSD
-# host building a release for the same system). The target runs ATF, which is
-# not in the toolchain, and the tests execute code built for the target host.
-#
-# Due to the dependencies of the binaries built by the source tree and how they
-# are used by tests, it is highly possible for a execution of "make test" to
-# report bogus results unless the new binaries are put in place.
-_TESTS_FIFO= ${.OBJDIR}/atf-run.fifo
-_TESTS_LOG= ${.OBJDIR}/atf-run.log
-CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG}
-realtest: .PHONY
- @set -e; \
- if [ -z "${TESTSDIR}" ]; then \
- echo "*** No TESTSDIR defined; nothing to do."; \
- exit 0; \
- fi; \
- cd ${DESTDIR}${TESTSDIR}; \
- rm -f ${_TESTS_FIFO}; \
- mkfifo ${_TESTS_FIFO}; \
- tee ${_TESTS_LOG} < ${_TESTS_FIFO} | ${TESTS_ENV} ${ATF_REPORT} & \
- set +e; \
- ${TESTS_ENV} ${ATF_RUN} >> ${_TESTS_FIFO}; \
- result=$${?}; \
- wait; \
- rm -f ${_TESTS_FIFO}; \
- echo; \
- echo "*** The verbatim output of atf-run has been saved to
${_TESTS_LOG}"; \
- echo "***"; \
- echo "*** WARNING: atf-run is deprecated; please install kyua instead";
\
- exit $${result}
-.endif
-
-.endif
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
