diff options
author | ngie <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
---|---|---|
committer | ngie <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
commit | dd1f61836762d6bb73b65e51a11b769b15667412 (patch) | |
tree | 67a85c5694bcdbbc7b1839be795cd25ef318ed91 /tests | |
parent | 2bf557556019c20890d0a2879f67d834b0527735 (diff) | |
download | FreeBSD-src-dd1f61836762d6bb73b65e51a11b769b15667412.zip FreeBSD-src-dd1f61836762d6bb73b65e51a11b769b15667412.tar.gz |
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
Diffstat (limited to 'tests')
-rw-r--r-- | tests/etc/Makefile | 2 | ||||
-rw-r--r-- | tests/sys/mqueue/Makefile | 2 | ||||
-rw-r--r-- | tests/sys/pjdfstest/tests/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/etc/Makefile b/tests/etc/Makefile index 9aad25c..1e49666 100644 --- a/tests/etc/Makefile +++ b/tests/etc/Makefile @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/etc -.PATH: ${.CURDIR:H} +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR+= rc.d diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile index 5af8b25..63741d2 100644 --- a/tests/sys/mqueue/Makefile +++ b/tests/sys/mqueue/Makefile @@ -6,7 +6,7 @@ ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} -CFLAGS+= -I${.CURDIR:H:H} +CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile index 248b209..95b4bbe 100644 --- a/tests/sys/pjdfstest/tests/Makefile +++ b/tests/sys/pjdfstest/tests/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H}/contrib/pjdfstest +PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest TESTSDIR= ${TESTSBASE}/sys/pjdfstest |