Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests Exclude tests that use rump
details: https://anonhg.NetBSD.org/src/rev/53317dffa97d
branches: trunk
changeset: 780815:53317dffa97d
user: christos <christos%NetBSD.org@localhost>
date: Wed Aug 08 13:57:05 2012 +0000
description:
Exclude tests that use rump
diffstat:
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(-)
diffs (201 lines):
diff -r d3da0bbccaa7 -r 53317dffa97d tests/Makefile
--- a/tests/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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
diff -r d3da0bbccaa7 -r 53317dffa97d tests/dev/Makefile
--- a/tests/dev/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/dev/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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>
diff -r d3da0bbccaa7 -r 53317dffa97d tests/include/sys/Makefile
--- a/tests/include/sys/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/include/sys/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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 @@
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>
diff -r d3da0bbccaa7 -r 53317dffa97d tests/kernel/Makefile
--- a/tests/kernel/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/kernel/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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 @@
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 @@
PROGS= h_ps_strings1
PROGS+= h_ps_strings2
-LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+
+.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_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_rnd+= -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+
+.endif
+
.PATH: ${NETBSDSRCDIR}/sys/kern
TESTS_C+= t_extent
diff -r d3da0bbccaa7 -r 53317dffa97d tests/lib/Makefile
--- a/tests/lib/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/lib/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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
diff -r d3da0bbccaa7 -r 53317dffa97d tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/lib/libc/sys/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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_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 @@
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 -r d3da0bbccaa7 -r 53317dffa97d tests/lib/semaphore/Makefile
--- a/tests/lib/semaphore/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/lib/semaphore/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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
diff -r d3da0bbccaa7 -r 53317dffa97d tests/net/Makefile
--- a/tests/net/Makefile Wed Aug 08 13:56:13 2012 +0000
+++ b/tests/net/Makefile Wed Aug 08 13:57:05 2012 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index