d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
80d53cbe7f
freebsd-dev/libexec/atf/atf-sh/tests/Makefile

32 lines
780 B
Makefile
Raw Normal View History

Build and install the atf tests. Reviewed by: freebsd-testing Approved by: rpaulo (mentor)
2013-11-08 14:33:41 +00:00
# $FreeBSD$
.include <bsd.init.mk>
Move atf-sh from /usr/bin/ to /usr/libexec/ In r266650, we made libatf-c and libatf-c++ private libraries so that no components outside of the source tree could unintendedly depend on them. This change does the same for the "atf-sh library" by moving the atf-sh interpreter from its public location in /usr/bin/ to the private location in /usr/libexec/. Our build system will ensure that our own test programs use the right binary, but users won't be able to depend on atf-sh by "mistake". Committing this now to ride the UPDATING notice added with r267172 today.
2014-06-06 18:58:06 +00:00
TESTSDIR= ${TESTSBASE}/libexec/atf/atf-sh
Build and install the atf tests. Reviewed by: freebsd-testing Approved by: rpaulo (mentor)
2013-11-08 14:33:41 +00:00
ATF= ${.CURDIR:H:H:H:H}/contrib/atf
.PATH: ${ATF}/atf-sh
ATF_TESTS_SH+= atf_check_test
ATF_TESTS_SH+= config_test
ATF_TESTS_SH+= integration_test
ATF_TESTS_SH+= normalize_test
ATF_TESTS_SH+= tc_test
ATF_TESTS_SH+= tp_test
Fix atf-sh's integration_test With the move of atf-sh into /usr/libexec in r267181, some of the tests in the integration_test program broke because they could not execute atf-sh from the path any longer. This slipped through because I do have a local atf installation in my home directory that appears in my path, hence the tests could still execute my own version. Fix this by forcing /usr/libexec to appear at the beginning of the path when attempting to execute atf-sh. To make upgrading easy (and to avoid an unnecessary entry in UPDATING), make integration_test depend on the Makefile so that a rebuild of the shell script is triggered. This requires a hack in the *.test.mk files to ensure the Makefile is not treated as a source to the generated program. Ugly, I know, but I don't have a better way of doing this at the moment. Will think of one once I address the TODO in the *.test.mk files that suggests generalizing the file generation functionality. PR: 191052 Reviewed by: Garrett Cooper
2014-07-09 00:55:50 +00:00
integration_test: Makefile
ATF_TESTS_SH_SED_integration_test= \
-e 's,atf_check,PATH=/usr/libexec:$${PATH} atf_check,g' \
-e 's,/usr/bin/env *atf-sh,/usr/libexec/atf-sh,g'
Prevent misc_helpers from running as a test. Do this by generating misc_helpers explicitly, without using the ATF_TESTS_SH functionality. While this script is technically an atf-sh test program, it is not intended to be run as a test and therefore it mustn't end up in the Kyuafile. Using ATF_TESTS_SH means that misc_helpers ended up registered in the Kyuafile and then failed to run as a test. The alternative would be to supply an explicit Kyuafile from this directory that lists the known test files, but doing it the way described above will be easier to maintain. MFC after: 3 days
2014-01-13 10:47:26 +00:00
SCRIPTS+= misc_helpers
SCRIPTSDIR_misc_helpers=${TESTSDIR}
CLEANFILES+= misc_helpers misc_helpers.tmp
misc_helpers: misc_helpers.sh
Move atf-sh from /usr/bin/ to /usr/libexec/ In r266650, we made libatf-c and libatf-c++ private libraries so that no components outside of the source tree could unintendedly depend on them. This change does the same for the "atf-sh library" by moving the atf-sh interpreter from its public location in /usr/bin/ to the private location in /usr/libexec/. Our build system will ensure that our own test programs use the right binary, but users won't be able to depend on atf-sh by "mistake". Committing this now to ride the UPDATING notice added with r267172 today.
2014-06-06 18:58:06 +00:00
echo '#! /usr/libexec/atf-sh' >${.TARGET}.tmp
Prevent misc_helpers from running as a test. Do this by generating misc_helpers explicitly, without using the ATF_TESTS_SH functionality. While this script is technically an atf-sh test program, it is not intended to be run as a test and therefore it mustn't end up in the Kyuafile. Using ATF_TESTS_SH means that misc_helpers ended up registered in the Kyuafile and then failed to run as a test. The alternative would be to supply an explicit Kyuafile from this directory that lists the known test files, but doing it the way described above will be easier to maintain. MFC after: 3 days
2014-01-13 10:47:26 +00:00
cat ${.ALLSRC} >>${.TARGET}.tmp
chmod +x ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
Make bsd.test.mk the only public mk fragment for the building of tests. Change {atf,plain,tap}.test.mk to be internal implementation details of bsd.test.mk. Makefiles that build tests should now only include bsd.test.mk and declaratively specify what they want to build, without worrying about the internal implementation of the mk files. The reason for this change is to permit building test programs of different interfaces from a single directory, which is something I had a need for while porting tests over from src/tools/regression/. Additionally, this change makes it possible to perform some other requested changes to bsd.test.mk in an easier manner. Coming soon.
2014-03-14 08:56:19 +00:00
.include <bsd.test.mk>
Reference in New Issue Copy Permalink