Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Apr 2014 01:15:10 +0000 (UTC)
From:      Julio Merino <jmmv@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r264996 - in stable/10: . bin/pkill bin/pkill/tests etc/mtree sbin sbin/dhclient sbin/dhclient/tests sbin/growfs sbin/growfs/tests sbin/mdconfig sbin/mdconfig/tests sbin/tests tools/bui...
Message-ID:  <201404270115.s3R1FASk051640@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jmmv
Date: Sun Apr 27 01:15:10 2014
New Revision: 264996
URL: http://svnweb.freebsd.org/changeset/base/264996

Log:
  MFC various moves of tools/regressions/ tests to the new infrastructure.
  
  - r263220 Migrate tools/regression/sbin/ to the new tests layout.
  - r263222 Add Makefile missed in r263220.
  - r263226 Migrate tools/regression/{usr.bin/lastcomm,usr.sbin}/ to the new tests layout.
  - r263227 Migrate most of tools/regression/usr.bin/ to the new tests layout.
  - r263345 Expand tabs that sneaked in into spaces.
  - r263346 Migrate tools/regression/usr.bin/make/ to the new tests layout.
  - r263348 Add Makefiles missed in r263346.
  - r263351 Migrate tools/regression/usr.bin/pkill/ to the new tests layout.
  - r263388 Mark multi_test as requiring /usr/share/dict/words.
  - r263814 Fix path to the run.pl script to let these tests run.
  - r264742 Prevent building tests when bootstrapping make.
  
  This is 'make tinderbox' clean.

Added:
  stable/10/bin/pkill/tests/
     - copied from r263351, head/bin/pkill/tests/
  stable/10/sbin/dhclient/tests/
     - copied from r263220, head/sbin/dhclient/tests/
  stable/10/sbin/growfs/tests/
     - copied from r263220, head/sbin/growfs/tests/
  stable/10/sbin/mdconfig/tests/
     - copied from r263220, head/sbin/mdconfig/tests/
  stable/10/sbin/mdconfig/tests/Makefile
     - copied unchanged from r263222, head/sbin/mdconfig/tests/Makefile
  stable/10/sbin/tests/
     - copied from r263220, head/sbin/tests/
  stable/10/usr.bin/apply/tests/
     - copied from r263227, head/usr.bin/apply/tests/
  stable/10/usr.bin/calendar/tests/
     - copied from r263227, head/usr.bin/calendar/tests/
  stable/10/usr.bin/comm/tests/
     - copied from r263227, head/usr.bin/comm/tests/
  stable/10/usr.bin/file2c/tests/
     - copied from r263227, head/usr.bin/file2c/tests/
  stable/10/usr.bin/join/tests/
     - copied from r263227, head/usr.bin/join/tests/
  stable/10/usr.bin/jot/tests/
     - copied from r263227, head/usr.bin/jot/tests/
  stable/10/usr.bin/lastcomm/tests/
     - copied from r263226, head/usr.bin/lastcomm/tests/
  stable/10/usr.bin/m4/tests/
     - copied from r263227, head/usr.bin/m4/tests/
  stable/10/usr.bin/make/tests/
     - copied from r263346, head/usr.bin/make/tests/
  stable/10/usr.bin/make/tests/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/Makefile
  stable/10/usr.bin/make/tests/archives/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/archives/Makefile
  stable/10/usr.bin/make/tests/archives/fmt_44bsd/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/archives/fmt_44bsd/Makefile
  stable/10/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile
  stable/10/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile
  stable/10/usr.bin/make/tests/basic/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/basic/Makefile
  stable/10/usr.bin/make/tests/basic/t0/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/basic/t0/Makefile
  stable/10/usr.bin/make/tests/basic/t1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/basic/t1/Makefile
  stable/10/usr.bin/make/tests/basic/t2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/basic/t2/Makefile
  stable/10/usr.bin/make/tests/basic/t3/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/basic/t3/Makefile
  stable/10/usr.bin/make/tests/execution/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/execution/Makefile
  stable/10/usr.bin/make/tests/execution/ellipsis/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/execution/ellipsis/Makefile
  stable/10/usr.bin/make/tests/execution/empty/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/execution/empty/Makefile
  stable/10/usr.bin/make/tests/execution/joberr/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/execution/joberr/Makefile
  stable/10/usr.bin/make/tests/execution/plus/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/execution/plus/Makefile
  stable/10/usr.bin/make/tests/shell/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/Makefile
  stable/10/usr.bin/make/tests/shell/builtin/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/builtin/Makefile
  stable/10/usr.bin/make/tests/shell/meta/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/meta/Makefile
  stable/10/usr.bin/make/tests/shell/path/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/path/Makefile
  stable/10/usr.bin/make/tests/shell/path_select/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/path_select/Makefile
  stable/10/usr.bin/make/tests/shell/replace/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/replace/Makefile
  stable/10/usr.bin/make/tests/shell/select/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/shell/select/Makefile
  stable/10/usr.bin/make/tests/suffixes/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/suffixes/Makefile
  stable/10/usr.bin/make/tests/suffixes/basic/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/suffixes/basic/Makefile
  stable/10/usr.bin/make/tests/suffixes/src_wild1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/suffixes/src_wild1/Makefile
  stable/10/usr.bin/make/tests/suffixes/src_wild2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/suffixes/src_wild2/Makefile
  stable/10/usr.bin/make/tests/syntax/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/syntax/Makefile
  stable/10/usr.bin/make/tests/syntax/directive-t0/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/syntax/directive-t0/Makefile
  stable/10/usr.bin/make/tests/syntax/enl/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/syntax/enl/Makefile
  stable/10/usr.bin/make/tests/syntax/funny-targets/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/syntax/funny-targets/Makefile
  stable/10/usr.bin/make/tests/syntax/semi/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/syntax/semi/Makefile
  stable/10/usr.bin/make/tests/sysmk/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/Makefile
  stable/10/usr.bin/make/tests/sysmk/t0/2/1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t0/2/1/Makefile
  stable/10/usr.bin/make/tests/sysmk/t0/2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t0/2/Makefile
  stable/10/usr.bin/make/tests/sysmk/t0/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t0/Makefile
  stable/10/usr.bin/make/tests/sysmk/t0/mk/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t0/mk/Makefile
  stable/10/usr.bin/make/tests/sysmk/t1/2/1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t1/2/1/Makefile
  stable/10/usr.bin/make/tests/sysmk/t1/2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t1/2/Makefile
  stable/10/usr.bin/make/tests/sysmk/t1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t1/Makefile
  stable/10/usr.bin/make/tests/sysmk/t1/mk/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t1/mk/Makefile
  stable/10/usr.bin/make/tests/sysmk/t2/2/1/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t2/2/1/Makefile
  stable/10/usr.bin/make/tests/sysmk/t2/2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t2/2/Makefile
  stable/10/usr.bin/make/tests/sysmk/t2/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t2/Makefile
  stable/10/usr.bin/make/tests/sysmk/t2/mk/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/sysmk/t2/mk/Makefile
  stable/10/usr.bin/make/tests/variables/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/variables/Makefile
  stable/10/usr.bin/make/tests/variables/modifier_M/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/variables/modifier_M/Makefile
  stable/10/usr.bin/make/tests/variables/modifier_t/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/variables/modifier_t/Makefile
  stable/10/usr.bin/make/tests/variables/opt_V/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/variables/opt_V/Makefile
  stable/10/usr.bin/make/tests/variables/t0/Makefile
     - copied unchanged from r263348, head/usr.bin/make/tests/variables/t0/Makefile
  stable/10/usr.bin/ncal/tests/
     - copied from r263227, head/usr.bin/ncal/tests/
  stable/10/usr.bin/printf/tests/
     - copied from r263227, head/usr.bin/printf/tests/
  stable/10/usr.bin/sed/tests/
     - copied from r263227, head/usr.bin/sed/tests/
  stable/10/usr.bin/tests/regress.m4
     - copied unchanged from r263227, head/usr.bin/tests/regress.m4
  stable/10/usr.bin/tr/tests/
     - copied from r263227, head/usr.bin/tr/tests/
  stable/10/usr.bin/uudecode/tests/
     - copied from r263227, head/usr.bin/uudecode/tests/
  stable/10/usr.bin/uuencode/tests/
     - copied from r263227, head/usr.bin/uuencode/tests/
  stable/10/usr.bin/xargs/tests/
     - copied from r263227, head/usr.bin/xargs/tests/
  stable/10/usr.bin/yacc/tests/
     - copied from r263227, head/usr.bin/yacc/tests/
  stable/10/usr.sbin/etcupdate/tests/
     - copied from r263226, head/usr.sbin/etcupdate/tests/
  stable/10/usr.sbin/newsyslog/tests/
     - copied from r263226, head/usr.sbin/newsyslog/tests/
  stable/10/usr.sbin/sa/tests/
     - copied from r263226, head/usr.sbin/sa/tests/
  stable/10/usr.sbin/tests/
     - copied from r263226, head/usr.sbin/tests/
Deleted:
  stable/10/tools/regression/sbin/
  stable/10/tools/regression/usr.bin/Makefile
  stable/10/tools/regression/usr.bin/apply/
  stable/10/tools/regression/usr.bin/calendar/
  stable/10/tools/regression/usr.bin/comm/
  stable/10/tools/regression/usr.bin/file2c/
  stable/10/tools/regression/usr.bin/join/
  stable/10/tools/regression/usr.bin/jot/
  stable/10/tools/regression/usr.bin/lastcomm/
  stable/10/tools/regression/usr.bin/m4/
  stable/10/tools/regression/usr.bin/make/
  stable/10/tools/regression/usr.bin/ncal/
  stable/10/tools/regression/usr.bin/pkill/
  stable/10/tools/regression/usr.bin/printf/
  stable/10/tools/regression/usr.bin/regress.m4
  stable/10/tools/regression/usr.bin/sed/
  stable/10/tools/regression/usr.bin/tr/
  stable/10/tools/regression/usr.bin/uudecode/
  stable/10/tools/regression/usr.bin/uuencode/
  stable/10/tools/regression/usr.bin/xargs/
  stable/10/tools/regression/usr.bin/yacc/
  stable/10/tools/regression/usr.sbin/
Modified:
  stable/10/Makefile
  stable/10/bin/pkill/Makefile
  stable/10/etc/mtree/BSD.tests.dist
  stable/10/sbin/Makefile
  stable/10/sbin/dhclient/Makefile
  stable/10/sbin/growfs/Makefile
  stable/10/sbin/mdconfig/Makefile
  stable/10/sbin/mdconfig/tests/legacy_test.sh
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.bin/apply/Makefile
  stable/10/usr.bin/calendar/Makefile
  stable/10/usr.bin/comm/Makefile
  stable/10/usr.bin/file2c/Makefile
  stable/10/usr.bin/join/Makefile
  stable/10/usr.bin/jot/Makefile
  stable/10/usr.bin/lastcomm/Makefile
  stable/10/usr.bin/m4/Makefile
  stable/10/usr.bin/make/Makefile
  stable/10/usr.bin/ncal/Makefile
  stable/10/usr.bin/printf/Makefile
  stable/10/usr.bin/sed/Makefile
  stable/10/usr.bin/sed/tests/Makefile
  stable/10/usr.bin/tests/Makefile
  stable/10/usr.bin/tr/Makefile
  stable/10/usr.bin/uudecode/Makefile
  stable/10/usr.bin/uuencode/Makefile
  stable/10/usr.bin/xargs/Makefile
  stable/10/usr.bin/yacc/Makefile
  stable/10/usr.sbin/Makefile
  stable/10/usr.sbin/etcupdate/Makefile
  stable/10/usr.sbin/newsyslog/Makefile
  stable/10/usr.sbin/sa/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile
==============================================================================
--- stable/10/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -345,7 +345,8 @@ MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 MMAKE=		${MMAKEENV} ${MAKE} \
 		-D_UPGRADING \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WERROR DESTDIR= PROGNAME=${MYMAKE:T}
+		-DNO_CPU_CFLAGS -DNO_WERROR \
+		DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T}
 
 make bmake: .PHONY
 	@echo

Modified: stable/10/bin/pkill/Makefile
==============================================================================
--- stable/10/bin/pkill/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/bin/pkill/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,6 +1,8 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	pkill
 
 DPADD=	${LIBKVM}
@@ -17,4 +19,8 @@ MLINKS=	pkill.1 pgrep.1
 SYMLINKS=	${BINDIR}/pkill /usr/bin/pkill
 SYMLINKS+=	${BINDIR}/pgrep /usr/bin/pgrep
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/etc/mtree/BSD.tests.dist
==============================================================================
--- stable/10/etc/mtree/BSD.tests.dist	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/etc/mtree/BSD.tests.dist	Sun Apr 27 01:15:10 2014	(r264996)
@@ -29,6 +29,8 @@
             ..
             pax
             ..
+            pkill
+            ..
             sh
                 builtins
                 ..
@@ -70,6 +72,14 @@
                 ..
             ..
         ..
+        sbin
+            dhclient
+            ..
+            growfs
+            ..
+            mdconfig
+            ..
+        ..
         share
             examples
                 tests
@@ -85,10 +95,150 @@
             ..
         ..
         usr.bin
+            apply
+            ..
             atf
                 atf-sh
                 ..
             ..
+            calendar
+            ..
+            comm
+            ..
+            file2c
+            ..
+            join
+            ..
+            jot
+            ..
+            lastcomm
+            ..
+            m4
+            ..
+            make
+                archives
+                    fmt_44bsd
+                    ..
+                    fmt_44bsd_mod
+                    ..
+                    fmt_oldbsd
+                    ..
+                ..
+                basic
+                    t0
+                    ..
+                    t1
+                    ..
+                    t2
+                    ..
+                    t3
+                    ..
+                ..
+                execution
+                    ellipsis
+                    ..
+                    empty
+                    ..
+                    joberr
+                    ..
+                    plus
+                    ..
+                ..
+                shell
+                    builtin
+                    ..
+                    meta
+                    ..
+                    path
+                    ..
+                    path_select
+                    ..
+                    replace
+                    ..
+                    select
+                    ..
+                ..
+                suffixes
+                    basic
+                    ..
+                    src_wild1
+                    ..
+                    src_wild2
+                    ..
+                ..
+                syntax
+                    directive-t0
+                    ..
+                    enl
+                    ..
+                    funny-targets
+                    ..
+                    semi
+                    ..
+                ..
+                sysmk
+                    t0
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t1
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                    t2
+                        2
+                            1
+                            ..
+                        ..
+                        mk
+                        ..
+                    ..
+                ..
+                variables
+                    modifier_M
+                    ..
+                    modifier_t
+                    ..
+                    opt_V
+                    ..
+                    t0
+                    ..
+                ..
+            ..
+            ncal
+            ..
+            printf
+            ..
+            sed
+                regress.multitest.out
+                ..
+            ..
+            tr
+            ..
+            uudecode
+            ..
+            uuencode
+            ..
+            xargs
+            ..
+            yacc
+            ..
+        ..
+        usr.sbin
+            etcupdate
+            ..
+            newsyslog
+            ..
+            sa
+            ..
         ..
     ..
 ..

Modified: stable/10/sbin/Makefile
==============================================================================
--- stable/10/sbin/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/sbin/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -114,6 +114,10 @@ SUBDIR+=	quotacheck
 SUBDIR+=	routed
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.arch.inc.mk>
 
 SUBDIR:=	${SUBDIR:O}

Modified: stable/10/sbin/dhclient/Makefile
==============================================================================
--- stable/10/sbin/dhclient/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/sbin/dhclient/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -31,6 +31,8 @@
 # OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+.include <bsd.own.mk>
+
 SRCS=	dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \
 	tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \
 	parse.c privsep.c
@@ -44,4 +46,8 @@ LDADD=	-lutil
 
 WARNS?=	2
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/sbin/growfs/Makefile
==============================================================================
--- stable/10/sbin/growfs/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/sbin/growfs/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -6,6 +6,8 @@
 
 #GFSDBG=
 
+.include <bsd.own.mk>
+
 .PATH:	${.CURDIR}/../mount
 
 PROG=   growfs
@@ -20,4 +22,8 @@ SRCS+=  debug.c
 DPADD=	${LIBUTIL}
 LDADD=	-lutil
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>      

Modified: stable/10/sbin/mdconfig/Makefile
==============================================================================
--- stable/10/sbin/mdconfig/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/sbin/mdconfig/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=		mdconfig
 MAN=		mdconfig.8
 
 DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
 LDADD=	-lutil -lgeom -lbsdxml -lsbuf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=    tests
+.endif
+
 .include <bsd.prog.mk>

Copied: stable/10/sbin/mdconfig/tests/Makefile (from r263222, head/sbin/mdconfig/tests/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/sbin/mdconfig/tests/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263222, head/sbin/mdconfig/tests/Makefile)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/sbin/mdconfig
+
+TAP_TESTS_SH=			legacy_test
+TAP_TESTS_SH_SED_legacy_test=   's,__PERL__,${TAP_PERL_INTERPRETER},g'
+TEST_METADATA.legacy_test+=	required_programs="${TAP_PERL_INTERPRETER}"
+
+FILESDIR=	${TESTSDIR}
+FILES=		mdconfig.test
+FILES+=		run.pl
+
+.include <bsd.test.mk>

Modified: stable/10/sbin/mdconfig/tests/legacy_test.sh
==============================================================================
--- head/sbin/mdconfig/tests/legacy_test.sh	Sun Mar 16 02:07:08 2014	(r263220)
+++ stable/10/sbin/mdconfig/tests/legacy_test.sh	Sun Apr 27 01:15:10 2014	(r264996)
@@ -38,7 +38,7 @@ fi
 
 TESTDIR=$(dirname $(realpath $0))
 
-__PERL__ -w -U $TESTDIR/run $TESTDIR/mdconfig.test > /dev/null
+__PERL__ -w -U $TESTDIR/run.pl $TESTDIR/mdconfig.test > /dev/null
 
 if [ $? -eq 0 ]; then
 	echo "ok 1"

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Sun Apr 27 01:15:10 2014	(r264996)
@@ -4092,6 +4092,376 @@ OLD_FILES+=usr/tests/lib/atf/libatf-c/pr
 OLD_FILES+=usr/tests/lib/atf/libatf-c/sanity_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/text_test
 OLD_FILES+=usr/tests/lib/atf/libatf-c/user_test
+.if ${MK_MAKE} == yes && ${MK_BMAKE} == yes
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.status.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stderr.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.6
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/expected.stdout.7
+OLD_FILES+=usr/tests/usr.bin/make/archives/fmt_oldbsd/libtest.a
+OLD_FILES+=usr/tests/usr.bin/make/archives/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/t3/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/ellipsis/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/empty/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/joberr/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/plus/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/execution/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/builtin/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/meta/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path/sh
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/path_select/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/replace/shell
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/shell/select/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/shell/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/basic/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST1.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/TEST2.a
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/src_wild2/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/suffixes/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/directive-t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.status.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stderr.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.4
+OLD_FILES+=usr/tests/usr.bin/make/syntax/enl/expected.stdout.5
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/funny-targets/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/syntax/semi/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/syntax/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/cleanup
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/1/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/sys.mk
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/mk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/t2/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/sysmk/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_M/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.status.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stderr.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/modifier_t/expected.stdout.3
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.status.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stderr.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/opt_V/expected.stdout.2
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/legacy_test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/Makefile.test
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.status.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stderr.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/t0/expected.stdout.1
+OLD_FILES+=usr/tests/usr.bin/make/variables/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/Kyuafile
+OLD_FILES+=usr/tests/usr.bin/make/common.sh
+OLD_FILES+=usr/tests/usr.bin/make/test-new.mk
+OLD_DIRS+=usr/tests/usr.bin/make/variables/t0
+OLD_DIRS+=usr/tests/usr.bin/make/variables/opt_V
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_t
+OLD_DIRS+=usr/tests/usr.bin/make/variables/modifier_M
+OLD_DIRS+=usr/tests/usr.bin/make/variables
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/mk
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2/1
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0/2
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk/t0
+OLD_DIRS+=usr/tests/usr.bin/make/sysmk
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/semi
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/funny-targets
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/enl
+OLD_DIRS+=usr/tests/usr.bin/make/syntax/directive-t0
+OLD_DIRS+=usr/tests/usr.bin/make/syntax
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild2
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/src_wild1
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes/basic
+OLD_DIRS+=usr/tests/usr.bin/make/suffixes
+OLD_DIRS+=usr/tests/usr.bin/make/shell/select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/replace
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path_select
+OLD_DIRS+=usr/tests/usr.bin/make/shell/path
+OLD_DIRS+=usr/tests/usr.bin/make/shell/meta
+OLD_DIRS+=usr/tests/usr.bin/make/shell/builtin
+OLD_DIRS+=usr/tests/usr.bin/make/shell
+OLD_DIRS+=usr/tests/usr.bin/make/execution/plus
+OLD_DIRS+=usr/tests/usr.bin/make/execution/joberr
+OLD_DIRS+=usr/tests/usr.bin/make/execution/empty
+OLD_DIRS+=usr/tests/usr.bin/make/execution/ellipsis
+OLD_DIRS+=usr/tests/usr.bin/make/execution
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t3
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t2
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t1
+OLD_DIRS+=usr/tests/usr.bin/make/basic/t0
+OLD_DIRS+=usr/tests/usr.bin/make/basic
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_oldbsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd_mod
+OLD_DIRS+=usr/tests/usr.bin/make/archives/fmt_44bsd
+OLD_DIRS+=usr/tests/usr.bin/make/archives
+OLD_DIRS+=usr/tests/usr.bin/make
+.endif
 .else
 # ATF libraries.
 OLD_FILES+=usr/bin/atf-sh

Modified: stable/10/usr.bin/apply/Makefile
==============================================================================
--- stable/10/usr.bin/apply/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/apply/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,8 +1,14 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	apply
 DPADD=	${LIBSBUF}
 LDADD=	-lsbuf
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/calendar/Makefile
==============================================================================
--- stable/10/usr.bin/calendar/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/calendar/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,6 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	calendar
 SRCS=	calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
 	ostern.c paskha.c pom.c sunpos.c calcpp.c
@@ -31,4 +33,8 @@ beforeinstall:
 	ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/comm/Makefile
==============================================================================
--- stable/10/usr.bin/comm/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/comm/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,6 +1,12 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	comm
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/file2c/Makefile
==============================================================================
--- stable/10/usr.bin/file2c/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/file2c/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,4 +1,11 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	file2c
+
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/join/Makefile
==============================================================================
--- stable/10/usr.bin/join/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/join/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,5 +1,12 @@
+# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
+.include <bsd.own.mk>
+
 PROG=	join
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/jot/Makefile
==============================================================================
--- stable/10/usr.bin/jot/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/jot/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,6 +1,12 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	jot
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/lastcomm/Makefile
==============================================================================
--- stable/10/usr.bin/lastcomm/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/lastcomm/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -1,7 +1,13 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 PROG=	lastcomm
 SRCS=	lastcomm.c readrec.c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/m4/Makefile
==============================================================================
--- stable/10/usr.bin/m4/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/m4/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -4,6 +4,8 @@
 # -DEXTENDED 
 # 	if you want the paste & spaste macros.
 
+.include <bsd.own.mk>
+
 PROG=	m4
 CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/lib
 DPADD=	${LIBY} ${LIBL} ${LIBM}
@@ -22,4 +24,8 @@ tokenizer.o: parser.h
 
 CLEANFILES+=	parser.c parser.h tokenizer.o
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: stable/10/usr.bin/make/Makefile
==============================================================================
--- stable/10/usr.bin/make/Makefile	Sun Apr 27 01:06:02 2014	(r264995)
+++ stable/10/usr.bin/make/Makefile	Sun Apr 27 01:15:10 2014	(r264996)
@@ -118,4 +118,8 @@ fmake.1: make.1
 	cp ${.ALLSRC} ${.TARGET}
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Copied: stable/10/usr.bin/make/tests/Makefile (from r263348, head/usr.bin/make/tests/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/Makefile)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make
+
+FILESDIR=	${TESTSDIR}
+FILES=		common.sh
+FILES+=		test-new.mk
+
+TESTS_SUBDIRS=	archives
+TESTS_SUBDIRS+=	basic
+TESTS_SUBDIRS+=	execution
+TESTS_SUBDIRS+=	shell
+TESTS_SUBDIRS+=	suffixes
+TESTS_SUBDIRS+=	syntax
+TESTS_SUBDIRS+=	sysmk
+TESTS_SUBDIRS+=	variables
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/archives/Makefile (from r263348, head/usr.bin/make/tests/archives/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/archives/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/archives/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives
+
+TESTS_SUBDIRS=	fmt_44bsd fmt_44bsd_mod fmt_oldbsd
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/archives/fmt_44bsd/Makefile (from r263348, head/usr.bin/make/tests/archives/fmt_44bsd/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/archives/fmt_44bsd/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/archives/fmt_44bsd/Makefile)
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile (from r263348, head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/archives/fmt_44bsd_mod/Makefile)
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_44bsd_mod
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/archives/fmt_oldbsd/Makefile (from r263348, head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/archives/fmt_oldbsd/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/archives/fmt_oldbsd/Makefile)
@@ -0,0 +1,32 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/archives/fmt_oldbsd
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		Makefile.test
+FILES+=		expected.status.1
+FILES+=		expected.status.2
+FILES+=		expected.status.3
+FILES+=		expected.status.4
+FILES+=		expected.status.5
+FILES+=		expected.status.6
+FILES+=		expected.status.7
+FILES+=		expected.stderr.1
+FILES+=		expected.stderr.2
+FILES+=		expected.stderr.3
+FILES+=		expected.stderr.4
+FILES+=		expected.stderr.5
+FILES+=		expected.stderr.6
+FILES+=		expected.stderr.7
+FILES+=		expected.stdout.1
+FILES+=		expected.stdout.2
+FILES+=		expected.stdout.3
+FILES+=		expected.stdout.4
+FILES+=		expected.stdout.5
+FILES+=		expected.stdout.6
+FILES+=		expected.stdout.7
+FILES+=		libtest.a
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/basic/Makefile (from r263348, head/usr.bin/make/tests/basic/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/basic/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/basic/Makefile)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic
+
+TESTS_SUBDIRS=	t0 t1 t2 t3
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/basic/t0/Makefile (from r263348, head/usr.bin/make/tests/basic/t0/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/basic/t0/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/basic/t0/Makefile)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t0
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}
+FILES=		expected.status.1
+FILES+=		expected.stderr.1
+FILES+=		expected.stdout.1
+
+.include <bsd.test.mk>

Copied: stable/10/usr.bin/make/tests/basic/t1/Makefile (from r263348, head/usr.bin/make/tests/basic/t1/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/usr.bin/make/tests/basic/t1/Makefile	Sun Apr 27 01:15:10 2014	(r264996, copy of r263348, head/usr.bin/make/tests/basic/t1/Makefile)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+TESTSDIR=	${TESTSBASE}/usr.bin/make/basic/t1
+
+TAP_TESTS_SH=	legacy_test
+
+FILESDIR=	${TESTSDIR}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404270115.s3R1FASk051640>