Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build tests that depend on RUMP if BSD_MK_COMPAT_FILE is defined.

Browse Source
This commit is contained in:
matt 2015-06-22 00:05:23 +00:00
parent 627745abcd
commit b9e582e94c
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.44 2013/02/25 00:33:19 jmmv Exp $ # $NetBSD: Makefile,v 1.45 2015/06/22 00:05:23 matt Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -9,7 +9,7 @@ TESTSDIR= ${TESTSBASE}
TESTS_SUBDIRS= bin dev games include kernel lib libexec net TESTS_SUBDIRS= bin dev games include kernel lib libexec net
TESTS_SUBDIRS+= sbin sys usr.bin usr.sbin TESTS_SUBDIRS+= sbin sys usr.bin usr.sbin
. if (${MKRUMP} != "no") . if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= fs rump TESTS_SUBDIRS+= fs rump
. if ${MKKMOD} != "no" . if ${MKKMOD} != "no"

4
tests/dev/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2012/08/08 13:57:05 christos Exp $ # $NetBSD: Makefile,v 1.9 2015/06/22 00:05:23 matt Exp $
# #
.include <bsd.own.mk> .include <bsd.own.mk>
@ -6,7 +6,7 @@
TESTSDIR= ${TESTSBASE}/dev TESTSDIR= ${TESTSBASE}/dev
TESTS_SUBDIRS+= cgd raidframe TESTS_SUBDIRS+= cgd raidframe
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= audio md scsipi sysmon TESTS_SUBDIRS+= audio md scsipi sysmon
.endif .endif

4
tests/include/sys/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2012/08/08 13:57:06 christos Exp $ # $NetBSD: Makefile,v 1.8 2015/06/22 00:05:23 matt Exp $
NOMAN= # defined NOMAN= # defined
@ -10,7 +10,7 @@ TESTS_C= t_bitops t_bootblock t_cdefs t_tree t_types
LDADD.t_bitops+= -lm LDADD.t_bitops+= -lm
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_socket TESTS_C+= t_socket
LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet
LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread

4
tests/kernel/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.36 2014/08/10 16:44:37 tls Exp $ # $NetBSD: Makefile,v 1.37 2015/06/22 00:05:23 matt Exp $
NOMAN= # defined NOMAN= # defined
@ -27,7 +27,7 @@ PROGS+= h_ps_strings2
LDADD.t_mqueue+= -lrt LDADD.t_mqueue+= -lrt
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= tty TESTS_SUBDIRS+= tty
TESTS_C+= t_extattrctl TESTS_C+= t_extattrctl

4
tests/lib/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.23 2013/02/16 21:40:07 jmmv Exp $ # $NetBSD: Makefile,v 1.24 2015/06/22 00:05:23 matt Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -6,7 +6,7 @@ TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libevent libexecinfo \
libm libobjc libposix libppath libprop libpthread \ libm libobjc libposix libppath libprop libpthread \
librt libtre libutil semaphore librt libtre libutil semaphore
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= librumpclient librumphijack TESTS_SUBDIRS+= librumpclient librumphijack
.endif .endif

4
tests/lib/libc/sys/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.38 2015/04/05 06:36:52 martin Exp $ # $NetBSD: Makefile,v 1.39 2015/06/22 00:05:23 matt Exp $
MKMAN= no MKMAN= no
@ -71,7 +71,7 @@ SRCS.t_mprotect= t_mprotect.c ${SRCS_EXEC_PROT}
LDADD.t_getpid+= -lpthread LDADD.t_getpid+= -lpthread
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_posix_fadvise TESTS_C+= t_posix_fadvise
LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
.endif .endif

4
tests/lib/semaphore/Makefile
View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.3 2012/08/08 13:57:06 christos Exp $ # $NetBSD: Makefile,v 1.4 2015/06/22 00:05:23 matt Exp $
# #
.include <bsd.own.mk> .include <bsd.own.mk>
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS= pthread TESTS_SUBDIRS= pthread
.endif .endif

4
tests/net/Makefile
View File

@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.22 2015/05/26 00:42:07 ozaki-r Exp $ # $NetBSD: Makefile,v 1.23 2015/06/22 00:05:23 matt Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass in_cksum net sys TESTS_SUBDIRS= fdpass in_cksum net sys
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_bridge if_loop mcast TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_bridge if_loop mcast
TESTS_SUBDIRS+= mpls npf route TESTS_SUBDIRS+= mpls npf route
.if (${MKSLJIT} != "no") .if (${MKSLJIT} != "no")

4
tests/net/net/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2015/05/20 17:39:04 christos Exp $ # $NetBSD: Makefile,v 1.11 2015/06/22 00:05:23 matt Exp $
# #
.include <bsd.own.mk> .include <bsd.own.mk>
@ -9,7 +9,7 @@ TESTS_C= t_unix
TESTS_C+= t_tcp TESTS_C+= t_tcp
TESTS_C+= t_udp TESTS_C+= t_udp
TESTS_C+= t_pktinfo TESTS_C+= t_pktinfo
.if (${MKRUMP} != "no") .if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
TESTS_C+= t_raw TESTS_C+= t_raw
TESTS_SH= t_forwarding TESTS_SH= t_forwarding
.endif .endif