[src/trunk]: src/tests Don't build tests that depend on RUMP if BSD_MK_COMPAT...

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

details:   https://anonhg.NetBSD.org/src/rev/9a45f9c2f437
branches:  trunk
changeset: 339002:9a45f9c2f437
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 22 00:05:23 2015 +0000

description:
Don't build tests that depend on RUMP if BSD_MK_COMPAT_FILE is defined.

diffstat:

 tests/Makefile               |  4 ++--
 tests/dev/Makefile           |  4 ++--
 tests/include/sys/Makefile   |  4 ++--
 tests/kernel/Makefile        |  4 ++--
 tests/lib/Makefile           |  4 ++--
 tests/lib/libc/sys/Makefile  |  4 ++--
 tests/lib/semaphore/Makefile |  4 ++--
 tests/net/Makefile           |  4 ++--
 tests/net/net/Makefile       |  4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diffs (157 lines):

diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/Makefile
--- a/tests/Makefile    Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/Makefile    Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/02/25 00:33:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2015/06/22 00:05:23 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,7 @@
 TESTS_SUBDIRS=         bin dev games include kernel lib libexec net
 TESTS_SUBDIRS+=                sbin sys usr.bin usr.sbin
 
-. if (${MKRUMP} != "no")
+. if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+=                fs rump
 
 . if ${MKKMOD} != "no"
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/dev/Makefile
--- a/tests/dev/Makefile        Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/dev/Makefile        Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2012/08/08 13:57:05 christos Exp $
+#      $NetBSD: Makefile,v 1.9 2015/06/22 00:05:23 matt Exp $
 #
 
 .include <bsd.own.mk>
@@ -6,7 +6,7 @@
 TESTSDIR=      ${TESTSBASE}/dev
 
 TESTS_SUBDIRS+=        cgd raidframe
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE) 
 TESTS_SUBDIRS+=        audio md scsipi sysmon
 .endif
 
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/include/sys/Makefile
--- a/tests/include/sys/Makefile        Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/include/sys/Makefile        Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/08/08 13:57:06 christos Exp $
+# $NetBSD: Makefile,v 1.8 2015/06/22 00:05:23 matt Exp $
 
 NOMAN=         # defined
 
@@ -10,7 +10,7 @@
 
 LDADD.t_bitops+=       -lm
 
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_C+= t_socket
 LDADD.t_socket+=       -lrumpnet_local -lrumpnet_net -lrumpnet
 LDADD.t_socket+=       -lrumpvfs -lrump -lrumpuser -lpthread
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/kernel/Makefile
--- a/tests/kernel/Makefile     Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/kernel/Makefile     Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/08/10 16:44:37 tls Exp $
+# $NetBSD: Makefile,v 1.37 2015/06/22 00:05:23 matt Exp $
 
 NOMAN=         # defined
 
@@ -27,7 +27,7 @@
 LDADD.t_mqueue+= -lrt
 
 
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+=        tty
 
 TESTS_C+=      t_extattrctl
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/lib/Makefile
--- a/tests/lib/Makefile        Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/lib/Makefile        Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/02/16 21:40:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2015/06/22 00:05:23 matt Exp $
 
 .include <bsd.own.mk>
 
@@ -6,7 +6,7 @@
                libm libobjc libposix libppath libprop libpthread \
                librt libtre libutil semaphore
 
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+= librumpclient librumphijack
 .endif
 
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile       Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/lib/libc/sys/Makefile       Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2015/04/05 06:36:52 martin Exp $
+# $NetBSD: Makefile,v 1.39 2015/06/22 00:05:23 matt Exp $
 
 MKMAN= no
 
@@ -71,7 +71,7 @@
 
 LDADD.t_getpid+=        -lpthread
 
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_C+=              t_posix_fadvise
 LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
 .endif
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/lib/semaphore/Makefile
--- a/tests/lib/semaphore/Makefile      Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/lib/semaphore/Makefile      Mon Jun 22 00:05:23 2015 +0000
@@ -1,8 +1,8 @@
-#      $NetBSD: Makefile,v 1.3 2012/08/08 13:57:06 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2015/06/22 00:05:23 matt Exp $
 #
 .include <bsd.own.mk>
 
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS=         pthread
 .endif
 
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/net/Makefile
--- a/tests/net/Makefile        Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/net/Makefile        Mon Jun 22 00:05:23 2015 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2015/05/26 00:42:07 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.23 2015/06/22 00:05:23 matt Exp $
 
 .include <bsd.own.mk>
 
 TESTSDIR=      ${TESTSBASE}/net
 
 TESTS_SUBDIRS=         fdpass in_cksum net sys
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_SUBDIRS+=                bpf bpfilter carp icmp if if_bridge if_loop mcast
 TESTS_SUBDIRS+=                mpls npf route
 .if (${MKSLJIT} != "no")
diff -r 57d6078e9f9c -r 9a45f9c2f437 tests/net/net/Makefile
--- a/tests/net/net/Makefile    Sun Jun 21 20:26:02 2015 +0000
+++ b/tests/net/net/Makefile    Mon Jun 22 00:05:23 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/05/20 17:39:04 christos Exp $
+# $NetBSD: Makefile,v 1.11 2015/06/22 00:05:23 matt Exp $
 #
 
 .include <bsd.own.mk>
@@ -9,7 +9,7 @@
 TESTS_C+=      t_tcp
 TESTS_C+=      t_udp
 TESTS_C+=      t_pktinfo
-.if (${MKRUMP} != "no")
+.if (${MKRUMP} != "no") && !defined(BSD_MK_COMPAT_FILE)
 TESTS_C+=      t_raw
 TESTS_SH=      t_forwarding
 .endif