svn commit: r276490 - in stable/10: bin/sleep bin/sleep/tests etc/mtree gnu/usr.bin/diff gnu/usr.bin/diff/tests usr.bin/basename usr.bin/basename/tests usr.bin/cmp usr.bin/cmp/tests usr.bin/cut usr...
Garrett Cooper
ngie at FreeBSD.org
Thu Jan 1 02:04:48 UTC 2015
Author: ngie
Date: Thu Jan 1 02:04:44 2015
New Revision: 276490
URL: https://svnweb.freebsd.org/changeset/base/276490
Log:
MFC r272777,r272779,r272780,r272781,r272782,r272783,r272784,r272787,r272788:
r272777:
Integrate usr.sbin/nmtree/tests from NetBSD into atf/kyua
In collaboration with: pho
Sponsored by: EMC / Isilon Storage Division
r272779:
Integrate usr.sbin/basename/tests from NetBSD into atf/kyua
In collaboration with: pho
Sponsored by: EMC / Isilon Storage Division
r272780:
Integrate usr.bin/cmp/tests from NetBSD into atf/kyua
In collaboration with: sjg
Sponsored by: EMC / Isilon Storage Division
r272781:
Integrate usr.bin/dirname/tests from NetBSD into atf/kyua
In collaboration with: pho, sjg
Sponsored by: EMC / Isilon Storage Division
r272782:
Integrate bin/sleep/tests from NetBSD into atf/kyua
Sponsored by: EMC / Isilon Storage Division
r272783:
Integrate usr.bin/cut/tests from NetBSD into atf/kyua
Sponsored by: EMC / Isilon Storage Division
r272784:
Integrate usr.bin/grep/tests from NetBSD into atf/kyua
Sponsored by: EMC / Isilon Storage Division
r272787:
Integrate usr.bin/diff/tests from NetBSD into atf/kyua at gnu/usr.bin/diff/tests
Sponsored by: EMC / Isilon Storage Division
r272788:
Integrate usr.bin/gzip/tests from NetBSD into atf/kyua
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/bin/sleep/tests/
- copied from r272782, head/bin/sleep/tests/
stable/10/gnu/usr.bin/diff/tests/
- copied from r272787, head/gnu/usr.bin/diff/tests/
stable/10/usr.bin/basename/tests/
- copied from r272779, head/usr.bin/basename/tests/
stable/10/usr.bin/cmp/tests/
- copied from r272780, head/usr.bin/cmp/tests/
stable/10/usr.bin/cut/tests/
- copied from r272783, head/usr.bin/cut/tests/
stable/10/usr.bin/dirname/tests/
- copied from r272781, head/usr.bin/dirname/tests/
stable/10/usr.bin/grep/tests/
- copied from r272784, head/usr.bin/grep/tests/
stable/10/usr.bin/gzip/tests/
- copied from r272788, head/usr.bin/gzip/tests/
stable/10/usr.sbin/nmtree/tests/
- copied from r272777, head/usr.sbin/nmtree/tests/
Modified:
stable/10/bin/sleep/Makefile
stable/10/etc/mtree/BSD.tests.dist
stable/10/gnu/usr.bin/diff/Makefile
stable/10/usr.bin/basename/Makefile
stable/10/usr.bin/cmp/Makefile
stable/10/usr.bin/cut/Makefile
stable/10/usr.bin/dirname/Makefile
stable/10/usr.bin/grep/Makefile
stable/10/usr.bin/gzip/Makefile
stable/10/usr.sbin/nmtree/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/bin/sleep/Makefile
==============================================================================
--- stable/10/bin/sleep/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/bin/sleep/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= sleep
+.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 Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/etc/mtree/BSD.tests.dist Thu Jan 1 02:04:44 2015 (r276490)
@@ -47,6 +47,8 @@
set-e
..
..
+ sleep
+ ..
test
..
..
@@ -68,6 +70,8 @@
lib
..
usr.bin
+ diff
+ ..
..
..
lib
@@ -169,6 +173,8 @@
usr.bin
apply
..
+ basename
+ ..
bmake
archives
fmt_44bsd
@@ -269,10 +275,20 @@
..
calendar
..
+ cmp
+ ..
comm
..
+ cut
+ ..
+ dirname
+ ..
file2c
..
+ grep
+ ..
+ gzip
+ ..
join
..
jot
@@ -309,6 +325,8 @@
..
newsyslog
..
+ nmtree
+ ..
pw
..
sa
Modified: stable/10/gnu/usr.bin/diff/Makefile
==============================================================================
--- stable/10/gnu/usr.bin/diff/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/gnu/usr.bin/diff/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
DIFFSRC=${.CURDIR}/../../../contrib/diff/src
.PATH: ${DIFFSRC} \
${.CURDIR}/../../../contrib/diff/lib \
@@ -27,4 +29,8 @@ SUBDIR+=doc
DPADD= ${LIBGNUREGEX}
LDADD= -lgnuregex
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/basename/Makefile
==============================================================================
--- stable/10/usr.bin/basename/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/basename/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,7 +1,13 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= basename
MLINKS= basename.1 dirname.1
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/cmp/Makefile
==============================================================================
--- stable/10/usr.bin/cmp/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/cmp/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,7 +1,13 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= cmp
SRCS= cmp.c link.c misc.c regular.c special.c
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/cut/Makefile
==============================================================================
--- stable/10/usr.bin/cut/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/cut/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,6 +1,12 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= cut
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/dirname/Makefile
==============================================================================
--- stable/10/usr.bin/dirname/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/dirname/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -1,7 +1,13 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+.include <bsd.own.mk>
+
PROG= dirname
MAN=
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/grep/Makefile
==============================================================================
--- stable/10/usr.bin/grep/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/grep/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -85,4 +85,8 @@ DPADD+= ${LIBGNUREGEX}
CFLAGS+= -DWITHOUT_NLS
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.bin/gzip/Makefile
==============================================================================
--- stable/10/usr.bin/gzip/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.bin/gzip/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -29,4 +29,8 @@ LINKS+= ${BINDIR}/gzip ${BINDIR}/gunzip
${BINDIR}/gzip ${BINDIR}/zcat \
${BINDIR}/zdiff ${BINDIR}/zcmp
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: stable/10/usr.sbin/nmtree/Makefile
==============================================================================
--- stable/10/usr.sbin/nmtree/Makefile Thu Jan 1 02:03:09 2015 (r276489)
+++ stable/10/usr.sbin/nmtree/Makefile Thu Jan 1 02:04:44 2015 (r276490)
@@ -31,4 +31,8 @@ CLEANFILES+= nmtree.8
nmtree.8: mtree.8
cp ${.ALLSRC} ${.TARGET}
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
More information about the svn-src-stable-10
mailing list