jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-27 13:32:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

MFC r272777,r272779,r272780,r272781,r272782,r272783,r272784,r272787,r272788:

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-01-01 02:04:44 +00:00
parent e59e3c3403
commit 4a8d6de7b4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/stable/10/; revision=276490
19 changed files with 237 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/sleep/Makefile
View File

@ -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>

12
bin/sleep/tests/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/sleep
ATF_TESTS_SH= sleep_test
ATF_TESTS_SH_SRC_sleep_test= t_sleep.sh
.include <bsd.test.mk>

18
etc/mtree/BSD.tests.dist
View File

@ -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

6
gnu/usr.bin/diff/Makefile
View File

@ -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>

17
gnu/usr.bin/diff/tests/Makefile Normal file
View File

@ -0,0 +1,17 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/gnu/usr.bin/diff
ATF_TESTS_SH= diff_test
ATF_TESTS_SH_SED_diff_test= -e 's/t_diff/`basename $$0`/g'
ATF_TESTS_SH_SRC_diff_test= t_diff.sh
FILESDIR= ${TESTSDIR}
FILES+= d_mallocv1.in
FILES+= d_mallocv2.in
.include <bsd.test.mk>

6
usr.bin/basename/Makefile
View File

@ -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>

12
usr.bin/basename/tests/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/basename
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/basename
ATF_TESTS_SH= basename_test
ATF_TESTS_SH_SRC_basename_test= t_basename.sh
.include <bsd.test.mk>

6
usr.bin/cmp/Makefile
View File

@ -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>

12
usr.bin/cmp/tests/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cmp
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/cmp
ATF_TESTS_SH= cmp_test
ATF_TESTS_SH_SRC_cmp_test= t_cmp.sh
.include <bsd.test.mk>

6
usr.bin/cut/Makefile
View File

@ -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>

21
usr.bin/cut/tests/Makefile Normal file
View File

@ -0,0 +1,21 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cut
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/cut
ATF_TESTS_SH= cut_test
ATF_TESTS_SH_SRC_cut_test= t_cut.sh
FILESDIR= ${TESTSDIR}
FILES= d_basic.out
FILES+= d_cut.in
FILES+= d_dflag.out
FILES+= d_dsflag.out
FILES+= d_latin1.in
FILES+= d_sflag.out
FILES+= d_utf8.in
.include <bsd.test.mk>

6
usr.bin/dirname/Makefile
View File

@ -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>

12
usr.bin/dirname/tests/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/dirname
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/dirname
ATF_TESTS_SH= dirname_test
ATF_TESTS_SH_SRC_dirname_test= t_dirname.sh
.include <bsd.test.mk>

4
usr.bin/grep/Makefile
View File

@ -85,4 +85,8 @@ DPADD+= ${LIBGNUREGEX}
CFLAGS+= -DWITHOUT_NLS
.endif
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
.include <bsd.prog.mk>

41
usr.bin/grep/tests/Makefile Normal file
View File

@ -0,0 +1,41 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/grep
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/grep
ATF_TESTS_SH= grep_test
ATF_TESTS_SH_SRC_grep_test= t_grep.sh
FILESDIR= ${TESTSDIR}
FILES= d_basic.out
FILES+= d_begin_end_a.out
FILES+= d_begin_end_b.out
FILES+= d_binary.out
FILES+= d_context2_a.out
FILES+= d_context2_b.out
FILES+= d_context2_c.out
FILES+= d_context_a.in
FILES+= d_context_a.out
FILES+= d_context_b.in
FILES+= d_context_b.out
FILES+= d_context_c.out
FILES+= d_context_d.out
FILES+= d_egrep.out
FILES+= d_file_exp.in
FILES+= d_file_exp.out
FILES+= d_ignore_case.out
FILES+= d_input
FILES+= d_invert.in
FILES+= d_invert.out
FILES+= d_recurse.out
FILES+= d_recurse_symlink.err
FILES+= d_recurse_symlink.out
FILES+= d_whole_line.out
FILES+= d_word_regexps.out
FILES+= d_zgrep.out
.include <bsd.test.mk>

4
usr.bin/gzip/Makefile
View File

@ -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>

12
usr.bin/gzip/tests/Makefile Normal file
View File

@ -0,0 +1,12 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/gzip
.PATH: ${TESTSRC}
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/usr.bin/gzip
ATF_TESTS_SH= gzip_test
ATF_TESTS_SH_SRC_gzip_test= t_gzip.sh
.include <bsd.test.mk>

4
usr.sbin/nmtree/Makefile
View File

@ -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>

32
usr.sbin/nmtree/tests/Makefile Normal file
View File

@ -0,0 +1,32 @@
# $FreeBSD$
TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/mtree
.PATH: ${TESTSRC}
TESTSDIR= ${TESTSBASE}/usr.sbin/nmtree
ATF_TESTS_SH= nmtree_test
ATF_TESTS_SH_SRC_nmtree_test= t_mtree.sh
FILESDIR= ${TESTSDIR}
# NOTE: the output from FreeBSD's nmtree displays sha256digest instead of
# sha256; we need to mangle the specfiles to reflect this.
.for f in mtree_d_create.out netbsd6_d_create.out
CLEANFILES+= $f $f.tmp
FILES+= $f
$f: ${TESTSRC}/$f
sed -e 's/sha256/sha256digest/g' < ${.ALLSRC} > ${.TARGET}.tmp
mv ${.TARGET}.tmp ${.TARGET}
.endfor
FILES+= d_convert.in
FILES+= d_convert_C.out
FILES+= d_convert_C_S.out
FILES+= d_convert_D.out
FILES+= d_convert_D_S.out
FILES+= d_merge.in
FILES+= d_merge_C_M.out
FILES+= d_merge_C_M_S.out
.include <bsd.test.mk>