From b219c275cc6821829771048716892ba2ae8e614a Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Sun, 4 Jan 2015 22:25:16 +0000 Subject: [PATCH] Integrate sbin/ifconfig/tests from NetBSD into atf/kyua Sponsored by: EMC / Isilon Storage Division --- ObsoleteFiles.inc | 1 - etc/mtree/BSD.tests.dist | 2 ++ sbin/ifconfig/Makefile | 4 ++++ sbin/ifconfig/tests/Makefile | 13 +++++++++++++ 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 sbin/ifconfig/tests/Makefile diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b496614f0d1c..6f5db70daf8f 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -308,7 +308,6 @@ OLD_DIRS+=usr/include/clang/3.4 OLD_FILES+=usr/share/mk/src.opts.mk # 20140505: Reject PR kern/187551 OLD_DIRS+=usr/tests/sbin/ifconfig -OLD_FILES+=usr/tests/sbin/ifconfig/Kyuafile OLD_FILES+=usr/tests/sbin/ifconfig/fibs_test # 20140502: Removal of lindev(4) OLD_FILES+=usr/share/man/man4/lindev.4.gz diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 2708568bc785..d6cee2aed0dd 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -160,6 +160,8 @@ .. growfs .. + ifconfig + .. mdconfig .. .. diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index 885f8a9922bd..ac7faf9fa460 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -65,4 +65,8 @@ MAN= ifconfig.8 CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs WARNS?= 2 +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile new file mode 100644 index 000000000000..044e9792d352 --- /dev/null +++ b/sbin/ifconfig/tests/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +OBJTOP= ${.OBJDIR}/../../.. +SRCTOP= ${.CURDIR}/../../.. +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/sbin/ifconfig + +TESTSDIR= ${TESTSBASE}/sbin/ifconfig + +NETBSD_ATF_TESTS_SH= nonexistent_test + +.include + +.include