Created attachment 143796 [details] Prefix all references to atf-sh with /usr/bin/env so the sed operation fills in /usr/libexec/atf-sh The atf-sh integration tests are broken after r267181 because the /usr/sbin is always expected to be in path whereas /usr/libexec isn't by design. The attached patch fixes the issue.
Over to committer in question.
The reason I added the sed magic to the Makefile was to avoid touching the files in contrib. I'd rather do the same here if possible, though it's proving to be tricky...
Created attachment 144195 [details] Fix path to atf-sh in test program Here comes an attempt to fix this. I'm changing all calls to atf_check to add /usr/libexec to the PATH. To do this, and to make upgrading transparent, I need to make integration_test depend on the Makefile... which in turn required some changes to *.test.mk. (The changes to the latter are hackish; not sure how to make nicer.) Testing the fix and will submit if things work fine.
(In reply to Julio Merino from comment #3) > Created attachment 144195 [details] > Fix path to atf-sh in test program > > Here comes an attempt to fix this. I'm changing all calls to atf_check to > add /usr/libexec to the PATH. To do this, and to make upgrading > transparent, I need to make integration_test depend on the Makefile... which > in turn required some changes to *.test.mk. (The changes to the latter are > hackish; not sure how to make nicer.) > > Testing the fix and will submit if things work fine. The proposed patch assumes that the extensions for script sources is always .sh -- that might not always be the case :/.
I know, but I have no better solution other than replacing the patterns to :N*Makefile* (which I have done locally). Not perfect, sure, but I think it's a good-enough compromise. If this ever becomes a problem we can revisit.
(In reply to Julio Merino from comment #5) > I know, but I have no better solution other than replacing the patterns to > :N*Makefile* (which I have done locally). Not perfect, sure, but I think > it's a good-enough compromise. If this ever becomes a problem we can > revisit. This caveat needs to be documented somewhere outside the Makefile snippet -- otherwise it's a bug waiting to be filed.
A commit references this bug: Author: jmmv Date: Wed Jul 9 00:55:51 UTC 2014 New revision: 268445 URL: http://svnweb.freebsd.org/changeset/base/268445 Log: 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 Changes: head/libexec/atf/atf-sh/tests/Makefile head/share/mk/atf.test.mk head/share/mk/plain.test.mk head/share/mk/tap.test.mk
A commit references this bug: Author: ngie Date: Tue Sep 9 04:00:33 UTC 2014 New revision: 271298 URL: http://svnweb.freebsd.org/changeset/base/271298 Log: MFC r267176, r267181, r268445 (ATF-related commits): Phabric: https://reviews.freebsd.org/D706 Approved by: rpaulo (mentor) Approved by: re (gjb) Reviewed by: jmmv Sponsored by: EMC / Isilon Storage Division r267176: Add the *_TESTS_SH_SED_* functionality to atf.test.mk. This exists already in plain.test.mk and tap.test.mk and should have been added to atf.test.mk too when the feature was first introduced. (It is probably time to address the related TODOs but I will do that separately.) r267181: 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. r268445: 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 Changes: _U stable/10/ stable/10/UPDATING stable/10/etc/mtree/BSD.tests.dist stable/10/libexec/atf/Makefile stable/10/libexec/atf/Makefile.inc stable/10/libexec/atf/atf-check/Makefile stable/10/libexec/atf/atf-sh/ stable/10/libexec/atf/atf-sh/Makefile stable/10/share/mk/atf.test.mk stable/10/share/mk/plain.test.mk stable/10/share/mk/tap.test.mk stable/10/tools/build/mk/OptionalObsoleteFiles.inc stable/10/usr.bin/Makefile