From cb461c6808d22d518f5525099ff5942170e5f1a9 Mon Sep 17 00:00:00 2001 From: christos Date: Wed, 8 Aug 2012 13:57:05 +0000 Subject: [PATCH] Exclude tests that use rump --- tests/Makefile | 10 +++++++--- tests/dev/Makefile | 8 ++++++-- tests/include/sys/Makefile | 8 ++++++-- tests/kernel/Makefile | 22 ++++++++++++++-------- tests/lib/Makefile | 8 ++++++-- tests/lib/libc/sys/Makefile | 7 +++++-- tests/lib/semaphore/Makefile | 5 ++++- tests/net/Makefile | 7 +++++-- 8 files changed, 53 insertions(+), 22 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 2ec50d367f38..73bea4dfbc1b 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2012/03/24 01:36:50 matt Exp $ +# $NetBSD: Makefile,v 1.38 2012/08/08 13:57:05 christos Exp $ .include @@ -7,12 +7,16 @@ TESTSDIR= ${TESTSBASE} ATFFILE= yes -SUBDIR= bin dev examples fs games include kernel lib libexec net -SUBDIR+= rump sbin sys usr.bin usr.sbin +SUBDIR= bin dev examples games include kernel lib libexec net +SUBDIR+= sbin sys usr.bin usr.sbin + +. if (${MKRUMP} != "no") +SUBDIR+= fs rump . if ${MKKMOD} != "no" SUBDIR+= modules . endif +. endif . if ${MKCRYPTO} != "no" SUBDIR+= crypto diff --git a/tests/dev/Makefile b/tests/dev/Makefile index 01365e68d19e..b9037474875d 100644 --- a/tests/dev/Makefile +++ b/tests/dev/Makefile @@ -1,10 +1,14 @@ -# $NetBSD: Makefile,v 1.7 2010/12/15 20:40:17 pooka Exp $ +# $NetBSD: Makefile,v 1.8 2012/08/08 13:57:05 christos Exp $ # .include TESTSDIR= ${TESTSBASE}/dev -TESTS_SUBDIRS+= audio cgd md raidframe scsipi sysmon +TESTS_SUBDIRS+= cgd raidframe +.if (${MKRUMP} != "no") +TESTS_SUBDIRS+= audio md scsipi sysmon +.endif + .include diff --git a/tests/include/sys/Makefile b/tests/include/sys/Makefile index cea51b95feac..577501ef1e75 100644 --- a/tests/include/sys/Makefile +++ b/tests/include/sys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/03/18 15:30:59 christos Exp $ +# $NetBSD: Makefile,v 1.7 2012/08/08 13:57:06 christos Exp $ NOMAN= # defined @@ -6,10 +6,14 @@ NOMAN= # defined TESTSDIR= ${TESTSBASE}/include/sys -TESTS_C= t_bitops t_bootblock t_cdefs t_socket t_tree t_types +TESTS_C= t_bitops t_bootblock t_cdefs t_tree t_types LDADD.t_bitops+= -lm + +.if (${MKRUMP} != "no") +TESTS_C+= t_socket LDADD.t_socket+= -lrumpnet_local -lrumpnet_net -lrumpnet LDADD.t_socket+= -lrumpvfs -lrump -lrumpuser -lpthread +.endif .include diff --git a/tests/kernel/Makefile b/tests/kernel/Makefile index fe4956a971f6..a189950faeb6 100644 --- a/tests/kernel/Makefile +++ b/tests/kernel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2012/03/17 17:23:34 jruoho Exp $ +# $NetBSD: Makefile,v 1.26 2012/08/08 13:57:06 christos Exp $ NOMAN= # defined @@ -6,13 +6,9 @@ NOMAN= # defined TESTSDIR= ${TESTSBASE}/kernel -TESTS_SUBDIRS= kqueue tty - +TESTS_SUBDIRS= kqueue TESTS_C= t_lock TESTS_C+= t_pty -TESTS_C+= t_rnd -TESTS_C+= t_extattrctl -TESTS_C+= t_filedesc TESTS_C+= t_subr_prf TESTS_SH= t_umount @@ -22,9 +18,19 @@ BINDIR= ${TESTSDIR} PROGS= h_ps_strings1 PROGS+= h_ps_strings2 -LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread -LDADD.t_filedesc+= ${LDADD.t_rnd} + +.if (${MKRUMP} != "no") +TESTS_SUBDIRS+= tty + +TESTS_C+= t_extattrctl +TESTS_C+= t_filedesc +TESTS_C+= t_rnd LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread +LDADD.t_filedesc+= ${LDADD.t_rnd} +LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread + +.endif + .PATH: ${NETBSDSRCDIR}/sys/kern TESTS_C+= t_extent diff --git a/tests/lib/Makefile b/tests/lib/Makefile index b31fba5827a9..8f3b9ea10fbe 100644 --- a/tests/lib/Makefile +++ b/tests/lib/Makefile @@ -1,10 +1,14 @@ -# $NetBSD: Makefile,v 1.19 2012/05/27 19:21:26 christos Exp $ +# $NetBSD: Makefile,v 1.20 2012/08/08 13:57:06 christos Exp $ .include TESTS_SUBDIRS= csu libbluetooth libc libcrypt libcurses libevent libexecinfo \ libm libobjc libposix libppath libprop libpthread \ - librt librumpclient librumphijack libtre libutil semaphore + librt libtre libutil semaphore + +.if (${MKRUMP} != "no") +TESTS_SUBDIRS+= librumpclient librumphijack +.endif .if ${MKCRYPTO} != "no" TESTS_SUBDIRS+= libdes diff --git a/tests/lib/libc/sys/Makefile b/tests/lib/libc/sys/Makefile index 071e6f5894d9..c15bd5af92d7 100644 --- a/tests/lib/libc/sys/Makefile +++ b/tests/lib/libc/sys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2012/06/22 18:45:23 christos Exp $ +# $NetBSD: Makefile,v 1.27 2012/08/08 13:57:06 christos Exp $ MKMAN= no @@ -45,7 +45,6 @@ TESTS_C+= t_msync TESTS_C+= t_nanosleep TESTS_C+= t_pipe TESTS_C+= t_pipe2 -TESTS_C+= t_posix_fadvise TESTS_C+= t_poll TESTS_C+= t_recvmmsg TESTS_C+= t_revoke @@ -66,7 +65,11 @@ TESTS_C+= t_write SRCS.t_mprotect= t_mprotect.c ${SRCS_EXEC_PROT} LDADD.t_getpid+= -lpthread + +.if (${MKRUMP} != "no") +TESTS_C+= t_posix_fadvise LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lpthread +.endif WARNS= 4 diff --git a/tests/lib/semaphore/Makefile b/tests/lib/semaphore/Makefile index aa3fcea1d2dd..c946e6aba244 100644 --- a/tests/lib/semaphore/Makefile +++ b/tests/lib/semaphore/Makefile @@ -1,7 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:27 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2012/08/08 13:57:06 christos Exp $ # +.include +.if (${MKRUMP} != "no") TESTS_SUBDIRS= pthread +.endif TESTSDIR= ${TESTSBASE}/lib/semaphore diff --git a/tests/net/Makefile b/tests/net/Makefile index fab3def38374..4b6878eb6825 100644 --- a/tests/net/Makefile +++ b/tests/net/Makefile @@ -1,9 +1,12 @@ -# $NetBSD: Makefile,v 1.9 2011/02/08 10:11:28 pooka Exp $ +# $NetBSD: Makefile,v 1.10 2012/08/08 13:57:06 christos Exp $ .include TESTSDIR= ${TESTSBASE}/net -TESTS_SUBDIRS= bpf carp icmp if if_loop net route sys +TESTS_SUBDIRS= route sys +.if (${MKRUMP} != "no") +TESTS_SUBDIRS+= bpf carp icmp if if_loop net +.endif .include