MFC r267176,r267181,r268445

[ngie]

Summary

MFC r267176,r267181,r268445

MFC r267176,r267181,r268445:

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

[rpaulo]

This might be OK, but phabric doesn't show the mergeinfo, so we can't be sure this was done properly...

[jmmv]

Looks good to me too, but as rpaulo suggested, could you post the commands you used to generate this? And possibly the output of "svn diff" that shows the mergeinfo changes too.

[jmmv]

Also note that we are now under a stable/10 freeze, so this will require explicit re@ approval. I think it'll be easy to get given that this is part of the "making ATF private" changes, half of which have already been merged.

[ngie]

Here's the svn:mergeinfo output in the branch staged for commit:

1. svn diff -N . Index: UPDATING ===================================================================
   • UPDATING (revision 270969) +++ UPDATING (working copy) @@ -26,11 +26,16 @@ programs once the operator executes "make delete-old-libs" after a "make installworld".
     
     + Additionally, the atf-sh binary was made private by moving it into + /usr/libexec/. Already-built shell test programs will keep the + path to the old binary so they will break after "make delete-old" + is run. + If you are using WITH_TESTS=yes (not the default), wipe the object tree and rebuild from scratch to prevent spurious test failures.
2. This is only needed once: the old, misnumbered libraries have been
3. added to OptionalObsoleteFiles.inc so they will be removed during a
4. clean upgrade. + This is only needed once: the misnumbered libraries and misplaced + binaries have been added to OptionalObsoleteFiles.inc so they will + be removed during a clean upgrade.
   
   20140814: The ixgbe tunables now match their sysctl counterparts, for example: Index: . ===================================================================
   • . (revision 270969) +++ . (working copy)
     
     Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r267176,267181,268445

[rpaulo]

Mergeinfo looks good to me. Please ask re@ for approval.

[ngie]

MFCs done in r271298 -- thank you for the review :)!