Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests Centralize the base rump libraries into a variable use...
details: https://anonhg.NetBSD.org/src/rev/3c9d04ff3ec9
branches: trunk
changeset: 1007827:3c9d04ff3ec9
user: christos <christos%NetBSD.org@localhost>
date: Sun Mar 01 18:08:12 2020 +0000
description:
Centralize the base rump libraries into a variable used by all the other
Makefiles so that we can make changes to it centrally as needed and have
less mess. Fixes the sun2 build that needs rumpvfs after librump after
the latest changes.
diffstat:
tests/Makefile.inc | 4 +++-
tests/dev/audio/Makefile | 8 ++------
tests/dev/cgd/Makefile | 9 +++------
tests/dev/dm/Makefile | 8 ++------
tests/dev/md/Makefile | 8 +++-----
tests/dev/scsipi/Makefile | 8 +++-----
tests/dev/sysmon/Makefile | 8 ++------
tests/dev/usb/t_hid/Makefile | 14 +++++---------
tests/fs/ffs/Makefile | 5 ++---
tests/fs/hfs/Makefile | 6 ++++--
tests/fs/kernfs/Makefile | 7 ++++---
tests/fs/lfs/Makefile | 6 ++++--
tests/fs/msdosfs/Makefile | 4 ++--
tests/fs/nfs/Makefile | 8 +++-----
tests/fs/nfs/nfsservice/Makefile | 8 ++++----
tests/fs/nullfs/Makefile | 6 ++++--
tests/fs/ptyfs/Makefile | 4 ++--
tests/fs/puffs/Makefile | 5 ++---
tests/fs/tmpfs/Makefile | 4 ++--
tests/fs/umapfs/Makefile | 6 ++++--
tests/fs/union/Makefile | 6 ++++--
tests/fs/vfs/Makefile | 5 ++---
tests/include/sys/Makefile | 4 ++--
tests/kernel/Makefile | 8 +++-----
tests/kernel/tty/Makefile | 6 ++----
tests/lib/libc/sys/Makefile | 4 ++--
tests/lib/semaphore/pthread/Makefile | 4 ++--
tests/modules/Makefile | 4 ++--
tests/net/bpf/Makefile | 4 ++--
tests/net/bpfilter/Makefile | 4 ++--
tests/net/bpfjit/Makefile | 4 ++--
tests/net/can/Makefile | 4 ++--
tests/net/icmp/Makefile | 4 ++--
tests/net/if/Makefile | 6 +++---
tests/net/if_loop/Makefile | 4 ++--
tests/net/net/Makefile | 6 +++---
tests/rump/rumpkern/Makefile | 7 +++----
tests/rump/rumpkern/h_server/Makefile | 4 ++--
tests/rump/rumpvfs/Makefile | 4 ++--
39 files changed, 104 insertions(+), 124 deletions(-)
diffs (truncated from 780 to 300 lines):
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/Makefile.inc
--- a/tests/Makefile.inc Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/Makefile.inc Sun Mar 01 18:08:12 2020 +0000
@@ -1,5 +1,7 @@
-# $NetBSD: Makefile.inc,v 1.5 2017/01/14 01:33:32 christos Exp $
+# $NetBSD: Makefile.inc,v 1.6 2020/03/01 18:08:12 christos Exp $
WARNS ?= 4
CWARNFLAGS+= -Wno-missing-noreturn
TOOLSSRCDIR:= ${.PARSEDIR}
CPPFLAGS+= -I${TOOLSSRCDIR}
+LIBRUMPBASE = -lrumpvfs -lrump -lrumpvfs -lrumpuser -lrump -lpthread
+
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/audio/Makefile
--- a/tests/dev/audio/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/audio/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2020/02/11 07:03:16 isaki Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -21,11 +21,7 @@
MKMAN=no
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_pad -lrumpdev_audio -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+LDADD+= -lrumpdev_pad -lrumpdev_audio ${LIBRUMPBASE}
WARNS= 4
NOMAN=
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/cgd/Makefile
--- a/tests/dev/cgd/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/cgd/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/03/01 17:06:26 christos Exp $
+# $NetBSD: Makefile,v 1.10 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -14,11 +14,8 @@
WARNS= 4
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev -lrumpdev_disk -lrumpdev_cgd -lrumpkern_crypto -lrumpvfs
-LDADD+= -lrump -lrumpvfs
-LDADD+= -lrumpuser
-LDADD+= -lrump -lutil
-LDADD+= -lpthread
+LDADD+= -lrumpdev -lrumpdev_disk -lrumpdev_cgd -lrumpkern_crypto ${LIBRUMPBASE}
+LDADD+= -lutil
.endif
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/dm/Makefile
--- a/tests/dev/dm/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/dm/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,5 +1,4 @@
-
-# $NetBSD: Makefile,v 1.3 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 18:08:12 christos Exp $
#
.include <bsd.own.mk>
@@ -16,10 +15,7 @@
CPPFLAGS+=-D_KERNTYPES
LDADD+= -lprop -lutil
-LDADD+= -lrumpdev_disk -lrumpdev_dm
-LDADD+= -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser -lpthread
+LDADD+= -lrumpdev_disk -lrumpdev_dm ${LIBRUMPBASE}
FILES= t_dm_disk_1.bz2.uue t_dm_disk_2.bz2.uue t_dm_disk_3.bz2.uue
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/md/Makefile
--- a/tests/dev/md/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/md/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.7 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -14,10 +14,8 @@
PROGS= h_mdserv
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev -lrumpvfs
-LDADD+= -lrumpkern_sysproxy -lrump
-LDADD+= -lrumpuser
-LDADD+= -lpthread
+LDADD+= -lrumpdev_md -lrumpdev_disk -lrumpdev
+LDADD+= -lrumpkern_sysproxy ${LIBRUMPBASE}
WARNS= 4
NOMAN=
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/scsipi/Makefile
--- a/tests/dev/scsipi/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/scsipi/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -15,10 +15,8 @@
LDFLAGS+= -L${SCSITESTDIR}
LDADD+= -Wl,--whole-archive -lrumpdev_scsitest -Wl,--no-whole-archive
-LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
-LDADD+= -lrump -lutil
-LDADD+= -lrumpuser -lpthread
-LDADD+= -lrump
+LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev ${LIBRUMPBASE}
+LDADD+= -lutil
WARNS= 4
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/sysmon/Makefile
--- a/tests/dev/sysmon/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/sysmon/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -8,11 +8,7 @@
TESTS_C= t_swwdog
CPPFLAGS+= -D_KERNTYPES
-LDADD+= -lrumpdev_sysmon -lrumpdev -lrumpvfs
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrump
-LDADD+= -lpthread
+LDADD+= -lrumpdev_sysmon -lrumpdev ${LIBRUMPBASE}
WARNS= 4
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/dev/usb/t_hid/Makefile
--- a/tests/dev/usb/t_hid/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/dev/usb/t_hid/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2019/06/01 06:59:17 kre Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 18:08:13 christos Exp $
#
+NOMAN=
+.include <bsd.own.mk>
+
PROG= t_hid
-NOMAN=
.PATH: ${.CURDIR}/..
@@ -10,8 +12,6 @@
CPPFLAGS.t_hid.c+= -I${.CURDIR}/../../../../sys/dev/usb
CPPFLAGS.t_hid.c+= -D_RUMPKERNEL
-.include <bsd.own.mk>
-
BINDIR= ${TESTSBASE}/dev/usb
LIBHIDDIR!= cd ${.CURDIR}/../libhid && ${PRINTOBJDIR}
@@ -20,10 +20,6 @@
DPADD+= ${LIBHIDDIR}/librumpdev_hid.a
DPADD+= ${ATF_C}
-LDADD+= -latf-c
-LDADD+= -lrump
-LDADD+= -lrumpuser
-LDADD+= -lrumpvfs
-LDADD+= -lpthread
+LDADD+= -latf-c ${LIBRUMPBASE}
.include <bsd.prog.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/ffs/Makefile
--- a/tests/fs/ffs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/ffs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2017/03/22 21:33:06 jdolecek Exp $
+# $NetBSD: Makefile,v 1.20 2020/03/01 18:08:13 christos Exp $
#
.include <bsd.own.mk>
@@ -35,7 +35,6 @@
LDADD+=-lrumpvfs_fifofs -lrumpnet_local -lrumpnet_net -lrumpnet # fifos
VFSTESTDIR != cd ${.CURDIR}/../common && ${PRINTOBJDIR}
LDADD+=-L${VFSTESTDIR} -lvfstest
-LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
-LDADD+=-lpthread
+LDADD+=-lrumpkern_sysproxy ${LIBRUMPBASE}
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/hfs/Makefile
--- a/tests/fs/hfs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/hfs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2011/02/18 13:07:54 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/hfs
TESTS_C= t_pathconvert
@@ -10,6 +12,6 @@
LDADD+= -lrumpfs_hfs # fs drivers
LDADD+= -lrumpdev_disk -lrumpdev # disk drivers
-LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/kernfs/Makefile
--- a/tests/fs/kernfs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/kernfs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/kernfs
WARNS= 4
TESTS_C= t_basic
-.include <bsd.own.mk>
LDADD+= -lrumpfs_kernfs # fs driver
-LDADD+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread # base
+LDADD+= ${LIBRUMPBASE}
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/lfs/Makefile
--- a/tests/fs/lfs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/lfs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2010/06/28 09:45:06 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2020/03/01 18:08:13 christos Exp $
#
+.include <bsd.own.mk>
+
TESTSDIR= ${TESTSBASE}/fs/lfs
WARNS= 4
@@ -8,6 +10,6 @@
LDADD+=-lrumpfs_lfs -lrumpfs_ffs # fs drivers
LDADD+=-lrumpdev_disk -lrumpdev # disk device
-LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+LDADD+=${LIBRUMPBASE}
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/msdosfs/Makefile
--- a/tests/fs/msdosfs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/msdosfs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/07 23:12:31 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 18:08:13 christos Exp $
#
TESTSDIR= ${TESTSBASE}/fs/msdosfs
@@ -9,7 +9,7 @@
LDADD+=-lrumpfs_msdos -lrumpfs_tmpfs # fs drivers
LDADD+=-lrumpdev_fss # snapshot dev
LDADD+=-lrumpdev_disk -lrumpdev # disk device
-LDADD+=-lrumpvfs -lrumpkern_sysproxy -lrump -lrumpuser # base
+LDADD+=-lrumpkern_sysproxy ${LIBRUMPBASE}
LDADD+=-lpthread
.include <bsd.test.mk>
diff -r 42b3dcde43fa -r 3c9d04ff3ec9 tests/fs/nfs/Makefile
--- a/tests/fs/nfs/Makefile Sun Mar 01 17:06:26 2020 +0000
+++ b/tests/fs/nfs/Makefile Sun Mar 01 18:08:12 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/01/08 03:50:56 pooka Exp $
+# $NetBSD: Makefile,v 1.11 2020/03/01 18:08:14 christos Exp $
#
.include <bsd.own.mk>
@@ -18,13 +18,11 @@
LDADD+=-L${VFSTESTDIR} -lvfstest
LDADD+=-lrumpfs_nfs # NFS
-LDADD+=-lrumpfs_ffs -lrumpvfs # ffs
+LDADD+=-lrumpfs_ffs # ffs
LDADD+=-lrumpdev_disk -lrumpdev # disk device
LDADD+=-lrumpnet_shmif # shmif
LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
Home |
Main Index |
Thread Index |
Old Index