diff options
author | Julio Merino <jmmv@FreeBSD.org> | 2014-07-09 00:55:50 +0000 |
---|---|---|
committer | Julio Merino <jmmv@FreeBSD.org> | 2014-07-09 00:55:50 +0000 |
commit | 64dc02450bd1cbbf1380d2aeff195e07db51c4c4 (patch) | |
tree | f043c7ef19d8bb1cb034c6e77e7dbb06726714c8 /share/mk/plain.test.mk | |
parent | ba8cd08ba951a68946b49115fc07a16cd59829c8 (diff) | |
download | src-64dc02450bd1cbbf1380d2aeff195e07db51c4c4.tar.gz src-64dc02450bd1cbbf1380d2aeff195e07db51c4c4.zip |
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
Notes
Notes:
svn path=/head/; revision=268445
Diffstat (limited to 'share/mk/plain.test.mk')
-rw-r--r-- | share/mk/plain.test.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/share/mk/plain.test.mk b/share/mk/plain.test.mk index 99685ef1d966..f26bab3e42ef 100644 --- a/share/mk/plain.test.mk +++ b/share/mk/plain.test.mk @@ -57,7 +57,8 @@ CLEANFILES+= ${_T} ${_T}.tmp PLAIN_TESTS_SH_SED_${_T}?= # empty PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh ${_T}: ${PLAIN_TESTS_SH_SRC_${_T}} - cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp + cat ${.ALLSRC:N*Makefile*} \ + | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor |