svn commit: r277457 - in stable/10: . etc etc/mtree tools/build/mk

[Craig Rodrigues]

On Tue, Jan 20, 2015 at 6:39 PM, Garrett Cooper <ngie at freebsd.org> wrote:

> Author: ngie
> Date: Tue Jan 20 23:39:08 2015
> New Revision: 277457
> URL: https://svnweb.freebsd.org/changeset/base/277457
>
> Log:
>   MFC r275907:
>
>   r275907 (by ngie):
>
>     Fix building/installing tests when TESTSBASE != /usr/tests
>
>

This merge is botched.  Can you fix this?

mtree is now creating these directories under /usr/tests/sys which is
wrong, and causing "installworld" to fail if
src.conf contains WITH_TESTS="yes"

usr/tests/sys/usr.sbin
usr/tests/sys/usr.sbin/sa
usr/tests/sys/usr.sbin/pw
usr/tests/sys/usr.sbin/fstyp
usr/tests/sys/usr.sbin/nmtree
usr/tests/sys/usr.sbin/newsyslog
usr/tests/sys/usr.sbin/etcupdate
usr/tests/sys/usr.sbin/makefs
usr/tests/sys/usr.bin
usr/tests/sys/usr.bin/tar
usr/tests/sys/usr.bin/cut
usr/tests/sys/usr.bin/comm
usr/tests/sys/usr.bin/col
usr/tests/sys/usr.bin/cpio
usr/tests/sys/usr.bin/file2c
usr/tests/sys/usr.bin/uudecode
usr/tests/sys/usr.bin/truncate
usr/tests/sys/usr.bin/cmp
usr/tests/sys/usr.bin/m4
usr/tests/sys/usr.bin/grep
usr/tests/sys/usr.bin/timeout
usr/tests/sys/usr.bin/lastcomm
usr/tests/sys/usr.bin/ncal
usr/tests/sys/usr.bin/yacc
usr/tests/sys/usr.bin/yacc/yacc
usr/tests/sys/usr.bin/join
usr/tests/sys/usr.bin/bmake
usr/tests/sys/usr.bin/bmake/basic
usr/tests/sys/usr.bin/bmake/basic/t3
usr/tests/sys/usr.bin/bmake/basic/t0
usr/tests/sys/usr.bin/bmake/basic/t2
usr/tests/sys/usr.bin/bmake/basic/t1
usr/tests/sys/usr.bin/bmake/shell
usr/tests/sys/usr.bin/bmake/shell/select
usr/tests/sys/usr.bin/bmake/shell/meta
usr/tests/sys/usr.bin/bmake/shell/path
usr/tests/sys/usr.bin/bmake/shell/path_select
usr/tests/sys/usr.bin/bmake/shell/builtin
usr/tests/sys/usr.bin/bmake/shell/replace
usr/tests/sys/usr.bin/bmake/sysmk
usr/tests/sys/usr.bin/bmake/sysmk/t1
usr/tests/sys/usr.bin/bmake/sysmk/t1/2
usr/tests/sys/usr.bin/bmake/sysmk/t1/2/1
usr/tests/sys/usr.bin/bmake/sysmk/t1/mk
usr/tests/sys/usr.bin/bmake/sysmk/t2
usr/tests/sys/usr.bin/bmake/sysmk/t2/mk
usr/tests/sys/usr.bin/bmake/sysmk/t2/2
usr/tests/sys/usr.bin/bmake/sysmk/t2/2/1
usr/tests/sys/usr.bin/bmake/sysmk/t0
usr/tests/sys/usr.bin/bmake/sysmk/t0/mk
usr/tests/sys/usr.bin/bmake/sysmk/t0/2
usr/tests/sys/usr.bin/bmake/sysmk/t0/2/1
usr/tests/sys/usr.bin/bmake/variables
usr/tests/sys/usr.bin/bmake/variables/modifier_t
usr/tests/sys/usr.bin/bmake/variables/opt_V
usr/tests/sys/usr.bin/bmake/variables/t0
usr/tests/sys/usr.bin/bmake/variables/modifier_M
usr/tests/sys/usr.bin/bmake/archives
usr/tests/sys/usr.bin/bmake/archives/fmt_oldbsd
usr/tests/sys/usr.bin/bmake/archives/fmt_44bsd_mod
usr/tests/sys/usr.bin/bmake/archives/fmt_44bsd
usr/tests/sys/usr.bin/bmake/suffixes
usr/tests/sys/usr.bin/bmake/suffixes/basic
usr/tests/sys/usr.bin/bmake/suffixes/src_wild2
usr/tests/sys/usr.bin/bmake/suffixes/src_wild1
usr/tests/sys/usr.bin/bmake/execution
usr/tests/sys/usr.bin/bmake/execution/plus
usr/tests/sys/usr.bin/bmake/execution/ellipsis
usr/tests/sys/usr.bin/bmake/execution/joberr
usr/tests/sys/usr.bin/bmake/execution/empty
usr/tests/sys/usr.bin/bmake/syntax
usr/tests/sys/usr.bin/bmake/syntax/enl
usr/tests/sys/usr.bin/bmake/syntax/funny-targets
usr/tests/sys/usr.bin/bmake/syntax/directive-t0
usr/tests/sys/usr.bin/bmake/syntax/semi
usr/tests/sys/usr.bin/sed
usr/tests/sys/usr.bin/sed/regress.multitest.out
usr/tests/sys/usr.bin/apply
usr/tests/sys/usr.bin/opensm
usr/tests/sys/usr.bin/calendar
usr/tests/sys/usr.bin/limits
usr/tests/sys/usr.bin/jot
usr/tests/sys/usr.bin/tr
usr/tests/sys/usr.bin/printf
usr/tests/sys/usr.bin/dirname
usr/tests/sys/usr.bin/xargs
usr/tests/sys/usr.bin/uuencode
usr/tests/sys/usr.bin/gzip
usr/tests/sys/usr.bin/basename

--
Craig