Module Name: src
Committed By: nakayama
Date: Wed Jul 3 14:01:29 UTC 2013
Modified Files:
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
src/tests/net: Makefile
src/tests/net/net: Makefile
Log Message:
Enable tests which does not require rump if MKRUMP=no.
Pointed out by christos on source-changes-d.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.538 -r1.539 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.13 -r1.14 src/tests/net/Makefile
cvs rdiff -u -r1.5 -r1.6 src/tests/net/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/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.25 src/distrib/sets/lists/debug/mi:1.26
--- src/distrib/sets/lists/debug/mi:1.25 Tue Jul 2 17:56:06 2013
+++ src/distrib/sets/lists/debug/mi Wed Jul 3 14:01:29 2013
@@ -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
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.538 src/distrib/sets/lists/tests/mi:1.539
--- src/distrib/sets/lists/tests/mi:1.538 Tue Jul 2 17:56:06 2013
+++ src/distrib/sets/lists/tests/mi Wed Jul 3 14:01:29 2013
@@ -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
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.13 src/tests/net/Makefile:1.14
--- src/tests/net/Makefile:1.13 Wed Sep 12 14:06:31 2012
+++ src/tests/net/Makefile Wed Jul 3 14:01:29 2013
@@ -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>
Index: src/tests/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.5 src/tests/net/net/Makefile:1.6
--- src/tests/net/net/Makefile:1.5 Thu Jun 27 20:01:24 2013
+++ src/tests/net/net/Makefile Wed Jul 3 14:01:29 2013
@@ -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
