diff options
| author | jmmv <jmmv@FreeBSD.org> | 2014-01-13 10:47:26 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2014-01-13 10:47:26 +0000 |
| commit | aae2faca3f9fa4074f57f1be1e8c1aab9038c680 (patch) | |
| tree | 909bc627423e81003afffb48bb705396c0ddae67 /usr.bin/atf | |
| parent | 794929e7d2e655f250373f08eea198a4e4269109 (diff) | |
| download | FreeBSD-src-aae2faca3f9fa4074f57f1be1e8c1aab9038c680.zip FreeBSD-src-aae2faca3f9fa4074f57f1be1e8c1aab9038c680.tar.gz | |
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
Diffstat (limited to 'usr.bin/atf')
| -rw-r--r-- | usr.bin/atf/atf-sh/tests/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
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> |
