Module Name: src
Committed By: christos
Date: Wed Aug 8 13:57:06 UTC 2012
Modified Files:
src/tests: Makefile
src/tests/dev: Makefile
src/tests/include/sys: Makefile
src/tests/kernel: Makefile
src/tests/lib: Makefile
src/tests/lib/libc/sys: Makefile
src/tests/lib/semaphore: Makefile
src/tests/net: Makefile
Log Message:
Exclude tests that use rump
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/tests/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tests/dev/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tests/include/sys/Makefile
cvs rdiff -u -r1.25 -r1.26 src/tests/kernel/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tests/lib/Makefile
cvs rdiff -u -r1.26 -r1.27 src/tests/lib/libc/sys/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/semaphore/Makefile
cvs rdiff -u -r1.9 -r1.10 src/tests/net/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.37 src/tests/Makefile:1.38
--- src/tests/Makefile:1.37 Fri Mar 23 21:36:50 2012
+++ src/tests/Makefile Wed Aug 8 09:57:05 2012
@@ -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 <bsd.own.mk>
@@ -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
Index: src/tests/dev/Makefile
diff -u src/tests/dev/Makefile:1.7 src/tests/dev/Makefile:1.8
--- src/tests/dev/Makefile:1.7 Wed Dec 15 15:40:17 2010
+++ src/tests/dev/Makefile Wed Aug 8 09:57:05 2012
@@ -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 <bsd.own.mk>
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 <bsd.test.mk>
Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.6 src/tests/include/sys/Makefile:1.7
--- src/tests/include/sys/Makefile:1.6 Sun Mar 18 11:30:59 2012
+++ src/tests/include/sys/Makefile Wed Aug 8 09:57:06 2012
@@ -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 <bsd.test.mk>
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.25 src/tests/kernel/Makefile:1.26
--- src/tests/kernel/Makefile:1.25 Sat Mar 17 13:23:34 2012
+++ src/tests/kernel/Makefile Wed Aug 8 09:57:06 2012
@@ -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
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.19 src/tests/lib/Makefile:1.20
--- src/tests/lib/Makefile:1.19 Sun May 27 15:21:26 2012
+++ src/tests/lib/Makefile Wed Aug 8 09:57:06 2012
@@ -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 <bsd.own.mk>
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
Index: src/tests/lib/libc/sys/Makefile
diff -u src/tests/lib/libc/sys/Makefile:1.26 src/tests/lib/libc/sys/Makefile:1.27
--- src/tests/lib/libc/sys/Makefile:1.26 Fri Jun 22 14:45:23 2012
+++ src/tests/lib/libc/sys/Makefile Wed Aug 8 09:57:06 2012
@@ -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
Index: src/tests/lib/semaphore/Makefile
diff -u src/tests/lib/semaphore/Makefile:1.2 src/tests/lib/semaphore/Makefile:1.3
--- src/tests/lib/semaphore/Makefile:1.2 Tue Jul 13 17:13:27 2010
+++ src/tests/lib/semaphore/Makefile Wed Aug 8 09:57:06 2012
@@ -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 <bsd.own.mk>
+.if (${MKRUMP} != "no")
TESTS_SUBDIRS= pthread
+.endif
TESTSDIR= ${TESTSBASE}/lib/semaphore
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.9 src/tests/net/Makefile:1.10
--- src/tests/net/Makefile:1.9 Tue Feb 8 05:11:28 2011
+++ src/tests/net/Makefile Wed Aug 8 09:57:06 2012
@@ -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 <bsd.own.mk>
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 <bsd.test.mk>
