On 10/6/2015 9:58 AM, Garrett Cooper wrote: > Author: ngie > Date: Tue Oct 6 16:58:47 2015 > New Revision: 288929 > URL: https://svnweb.freebsd.org/changeset/base/288929 > > Log: > Integrate the tests from libxo into the FreeBSD test suite > > The functional_test.sh harness for each test subdir was inspired > by the version in bin/sh/tests/functional_test.sh > > Some gymnastics were required to deal with implicit rules for > .c / .o -> .out as the suffix transformation rules were > incorrectly trying to create the test outputs from some of the > source files > > Sponsored by: EMC / Isilon Storage Division > > Added: > head/lib/libxo/tests/ > head/lib/libxo/tests/Makefile (contents, props changed) > head/lib/libxo/tests/functional_test.sh > - copied, changed from r288904, head/bin/sh/tests/functional_test.sh > head/usr.bin/xo/tests/ > head/usr.bin/xo/tests/Makefile (contents, props changed) > head/usr.bin/xo/tests/functional_test.sh > - copied, changed from r288904, head/bin/sh/tests/functional_test.sh > Modified: > head/etc/mtree/BSD.tests.dist > head/lib/libxo/Makefile > head/usr.bin/xo/Makefile > > Modified: head/etc/mtree/BSD.tests.dist > ============================================================================== > --- head/etc/mtree/BSD.tests.dist Tue Oct 6 16:35:50 2015 > (r288928) > +++ head/etc/mtree/BSD.tests.dist Tue Oct 6 16:58:47 2015 > (r288929) > @@ -310,6 +310,8 @@ > .. > libutil > .. > + libxo > + .. > msun > .. > .. > @@ -568,6 +570,8 @@ > .. > xargs > .. > + xo > + .. > yacc > yacc > .. > > Modified: head/lib/libxo/Makefile > ============================================================================== > --- head/lib/libxo/Makefile Tue Oct 6 16:35:50 2015 (r288928) > +++ head/lib/libxo/Makefile Tue Oct 6 16:58:47 2015 (r288929) > @@ -1,5 +1,7 @@ > # $FreeBSD$ > > +.include <src.opts.mk> > + > LIBXOSRC= ${SRCTOP}/contrib/libxo > > .PATH: ${LIBXOSRC}/libxo ... LIB= xo SHLIB_MAJOR=0
SHLIBDIR?= /lib FYI SHLIBDIR? needs to be before the src.opts.mk otherwise it changes to /usr/lib, which Peter found breaks boot :) -- Regards, Bryan Drewery
signature.asc
Description: OpenPGP digital signature