From dd1f61836762d6bb73b65e51a11b769b15667412 Mon Sep 17 00:00:00 2001 From: ngie Date: Mon, 12 Oct 2015 08:16:03 +0000 Subject: Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and netbsd-tests.test.mk (r289151) - Eliminate explicit OBJTOP/SRCTOP setting - Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk - Remove unnecessary TESTSDIR setting - Use SRCTOP where possible for clarity MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Divison --- sbin/devd/tests/Makefile | 2 -- sbin/dhclient/tests/Makefile | 2 -- sbin/growfs/tests/Makefile | 2 -- sbin/ifconfig/tests/Makefile | 6 ------ sbin/mdconfig/tests/Makefile | 3 --- sbin/tests/Makefile | 4 +--- 6 files changed, 1 insertion(+), 18 deletions(-) (limited to 'sbin') diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile index ee679ce..e06928c 100644 --- a/sbin/devd/tests/Makefile +++ b/sbin/devd/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/devd - ATF_TESTS_C= client_test TEST_METADATA.client_test= required_programs="devd" TEST_METADATA.client_test+= required_user="root" diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile index a460f7f..45cc8c2 100644 --- a/sbin/dhclient/tests/Makefile +++ b/sbin/dhclient/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/dhclient - .PATH: ${.CURDIR}/.. PLAIN_TESTS_C= option-domain-search_test diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile index 7a6a831..6a3208d 100644 --- a/sbin/growfs/tests/Makefile +++ b/sbin/growfs/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/growfs - TAP_TESTS_PERL= legacy_test .include diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index 044e979..93967c7 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,11 +1,5 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/sbin/ifconfig - -TESTSDIR= ${TESTSBASE}/sbin/ifconfig - NETBSD_ATF_TESTS_SH= nonexistent_test .include diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile index 08a9e47..6c179fc 100644 --- a/sbin/mdconfig/tests/Makefile +++ b/sbin/mdconfig/tests/Makefile @@ -1,10 +1,7 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/mdconfig - ATF_TESTS_SH= mdconfig_test - TEST_METADATA.mdconfig_test+= required_user="root" .include diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile index a298f87..a0e63e5 100644 --- a/sbin/tests/Makefile +++ b/sbin/tests/Makefile @@ -2,9 +2,7 @@ .include -TESTSDIR= ${TESTSBASE}/sbin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include -- cgit v1.1