[src/trunk]: src Enable tests which does not require rump if MKRUMP=no.

[nakayama <nakayama%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/66ec9b9147a4
branches:  trunk
changeset: 787780:66ec9b9147a4
user:      nakayama <nakayama%NetBSD.org@localhost>
date:      Wed Jul 03 14:01:29 2013 +0000

description:
Enable tests which does not require rump if MKRUMP=no.
Pointed out by christos on source-changes-d.

diffstat:

 distrib/sets/lists/debug/mi |   8 ++++----
 distrib/sets/lists/tests/mi |  12 ++++++------
 tests/net/Makefile          |   6 +++---
 tests/net/net/Makefile      |   8 +++++---
 4 files changed, 18 insertions(+), 16 deletions(-)

diffs (92 lines):

diff -r f852a8398e2b -r 66ec9b9147a4 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi       Wed Jul 03 12:55:34 2013 +0000
+++ b/distrib/sets/lists/debug/mi       Wed Jul 03 14:01:29 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.25 2013/07/02 17:56:06 nakayama Exp $
+# $NetBSD: mi,v 1.26 2013/07/03 14:01:29 nakayama Exp $
 ./etc/mtree/set.debug                           comp-sys-root
 ./usr/libdata/debug/bin/cat.debug              comp-util-debug         debug
 ./usr/libdata/debug/bin/chio.debug             comp-util-debug         debug
@@ -1817,10 +1817,10 @@
 ./usr/libdata/debug/usr/tests/net/icmp/t_ping.debug            tests-net-debug         debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/if/t_compat.debug            tests-net-debug         debug,atf,rump
 ./usr/libdata/debug/usr/tests/net/if_loop/t_pr.debug           tests-net-debug         debug,atf,rump
-./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug          tests-net-debug         debug,atf,rump
+./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug          tests-net-debug         debug,atf
 ./usr/libdata/debug/usr/tests/net/net/t_raw.debug              tests-net-debug         debug,atf,rump
-./usr/libdata/debug/usr/tests/net/net/t_udp.debug              tests-net-debug         debug,atf,rump
-./usr/libdata/debug/usr/tests/net/net/t_unix.debug             tests-net-debug         debug,atf,rump
+./usr/libdata/debug/usr/tests/net/net/t_udp.debug              tests-net-debug         debug,atf
+./usr/libdata/debug/usr/tests/net/net/t_unix.debug             tests-net-debug         debug,atf
 ./usr/libdata/debug/usr/tests/net/sys/t_connect.debug                  tests-obsolete          obsolete
 ./usr/libdata/debug/usr/tests/net/sys/t_listen.debug                   tests-obsolete          obsolete
 ./usr/libdata/debug/usr/tests/net/sys/t_rfc6056.debug                  tests-net-debug         debug,atf
diff -r f852a8398e2b -r 66ec9b9147a4 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi       Wed Jul 03 12:55:34 2013 +0000
+++ b/distrib/sets/lists/tests/mi       Wed Jul 03 14:01:29 2013 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.538 2013/07/02 17:56:06 nakayama Exp $
+# $NetBSD: mi,v 1.539 2013/07/03 14:01:29 nakayama Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -2598,12 +2598,12 @@
 ./usr/tests/net/if_loop/Kyuafile               tests-net-tests         atf,rump,kyua
 ./usr/tests/net/if_loop/t_pr           tests-net-tests         atf,rump
 ./usr/tests/net/net                            tests-net-tests
-./usr/tests/net/net/Atffile                    tests-net-tests         atf,rump
-./usr/tests/net/net/Kyuafile                   tests-net-tests         atf,rump,kyua
-./usr/tests/net/net/t_pktinfo          tests-net-tests         atf,rump
+./usr/tests/net/net/Atffile                    tests-net-tests         atf
+./usr/tests/net/net/Kyuafile                   tests-net-tests         atf,kyua
+./usr/tests/net/net/t_pktinfo          tests-net-tests         atf
 ./usr/tests/net/net/t_raw              tests-net-tests         atf,rump
-./usr/tests/net/net/t_udp              tests-net-tests         atf,rump
-./usr/tests/net/net/t_unix             tests-net-tests         atf,rump
+./usr/tests/net/net/t_udp              tests-net-tests         atf
+./usr/tests/net/net/t_unix             tests-net-tests         atf
 ./usr/tests/net/npf                    tests-net-tests
 ./usr/tests/net/npf/Atffile            tests-net-tests         atf,rump
 ./usr/tests/net/npf/Kyuafile           tests-net-tests         atf,rump,kyua
diff -r f852a8398e2b -r 66ec9b9147a4 tests/net/Makefile
--- a/tests/net/Makefile        Wed Jul 03 12:55:34 2013 +0000
+++ b/tests/net/Makefile        Wed Jul 03 14:01:29 2013 +0000
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.13 2012/09/12 14:06:31 martin Exp $
+# $NetBSD: Makefile,v 1.14 2013/07/03 14:01:29 nakayama Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/net
 
-TESTS_SUBDIRS=         fdpass route sys
+TESTS_SUBDIRS=         fdpass net route sys
 .if (${MKRUMP} != "no")
-TESTS_SUBDIRS+=                bpf bpfilter carp icmp if if_loop net npf
+TESTS_SUBDIRS+=                bpf bpfilter carp icmp if if_loop npf
 .endif
 
 .include <bsd.test.mk>
diff -r f852a8398e2b -r 66ec9b9147a4 tests/net/net/Makefile
--- a/tests/net/net/Makefile    Wed Jul 03 12:55:34 2013 +0000
+++ b/tests/net/net/Makefile    Wed Jul 03 14:01:29 2013 +0000
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2013/06/27 20:01:24 christos Exp $
+# $NetBSD: Makefile,v 1.6 2013/07/03 14:01:29 nakayama Exp $
 #
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/net/net
 
-TESTS_C=       t_raw
-TESTS_C+=      t_unix
+TESTS_C=       t_unix
 TESTS_C+=      t_udp
 TESTS_C+=      t_pktinfo
+.if (${MKRUMP} != "no")
+TESTS_C+=      t_raw
+.endif
 
 LDADD.t_raw+=          -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
 LDADD.t_raw+=          -lrumpnet -lrumpvfs -lrump -lrumpuser -lpthread