diff options
| author | jmmv <jmmv@FreeBSD.org> | 2014-03-06 13:20:38 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2014-03-06 13:20:38 +0000 |
| commit | 16411e2c8037afd4bccaee5ea6892c2b98c2193e (patch) | |
| tree | 67423e5f21e64a707fbeb882b3c143610ee4511f /usr.bin | |
| parent | 1d275c07c24a6ac00d3d1401553e8ccf196a4ad7 (diff) | |
| download | FreeBSD-src-16411e2c8037afd4bccaee5ea6892c2b98c2193e.zip FreeBSD-src-16411e2c8037afd4bccaee5ea6892c2b98c2193e.tar.gz | |
MFC various fixes for the ATF tests.
- r260505 Allow tests to provide a Kyuafile when they relied on auto-generation.
- r260525 Respect the original layout of the atf-{c,c++} tests.
- r260526 Fix path to the process_helpers for the libatf-c++ tests.
- r260576 Generate and install pkg-config files for atf.
- r260577 Add atf pkg-config files from the vendor branch.
- r260584 Prevent misc_helpers from running as a test.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/atf/atf-sh/Makefile | 11 | ||||
| -rw-r--r-- | usr.bin/atf/atf-sh/tests/Makefile | 10 |
2 files changed, 20 insertions, 1 deletions
diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile index 1688b19..1d72b56 100644 --- a/usr.bin/atf/atf-sh/Makefile +++ b/usr.bin/atf/atf-sh/Makefile @@ -45,8 +45,19 @@ FILESGROUPS= SUBR SUBRDIR= ${SHAREDIR}/atf SUBR= libatf-sh.subr +all: atf-sh.pc +atf-sh.pc: atf-sh.pc.in atf-version + sed -e 's,__EXEC_PREFIX__,/usr,g' \ + -e "s,__ATF_VERSION__,$$(cat atf-version),g" \ + <${ATF}/atf-sh/atf-sh.pc.in >atf-sh.pc + +beforeinstall: + ${INSTALL} -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + atf-sh.pc ${DESTDIR}${LIBDATADIR}/pkgconfig + .if ${MK_TESTS} != "no" SUBDIR+= tests .endif +.include "../../../lib/atf/common.mk" .include <bsd.prog.mk> diff --git a/usr.bin/atf/atf-sh/tests/Makefile b/usr.bin/atf/atf-sh/tests/Makefile index 664f25a..b43b649 100644 --- a/usr.bin/atf/atf-sh/tests/Makefile +++ b/usr.bin/atf/atf-sh/tests/Makefile @@ -10,9 +10,17 @@ ATF= ${.CURDIR:H:H:H:H}/contrib/atf ATF_TESTS_SH+= atf_check_test ATF_TESTS_SH+= config_test ATF_TESTS_SH+= integration_test -ATF_TESTS_SH+= misc_helpers ATF_TESTS_SH+= normalize_test ATF_TESTS_SH+= tc_test ATF_TESTS_SH+= tp_test +SCRIPTS+= misc_helpers +SCRIPTSDIR_misc_helpers=${TESTSDIR} +CLEANFILES+= misc_helpers misc_helpers.tmp +misc_helpers: misc_helpers.sh + echo '#! /usr/bin/atf-sh' >${.TARGET}.tmp + cat ${.ALLSRC} >>${.TARGET}.tmp + chmod +x ${.TARGET}.tmp + mv ${.TARGET}.tmp ${.TARGET} + .include <atf.test.mk> |
