[src/trunk]: src/tests Fix static linking for the tests: -lrump is also used ...

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

details:   https://anonhg.NetBSD.org/src/rev/4046372dfc92
branches:  trunk
changeset: 329798:4046372dfc92
user:      he <he%NetBSD.org@localhost>
date:      Tue Jun 10 04:28:39 2014 +0000

description:
Fix static linking for the tests: -lrump is also used by -lrumpuser,
so we also need -lrump after -lrumpuser.  Fixes build for sun2.

diffstat:

 tests/dev/scsipi/Makefile             |  3 ++-
 tests/dev/sysmon/Makefile             |  6 ++++--
 tests/fs/kernfs/Makefile              |  4 ++--
 tests/fs/nfs/Makefile                 |  4 ++--
 tests/fs/nullfs/Makefile              |  4 ++--
 tests/fs/ptyfs/Makefile               |  4 ++--
 tests/fs/puffs/Makefile               |  4 ++--
 tests/fs/umapfs/Makefile              |  4 ++--
 tests/fs/union/Makefile               |  4 ++--
 tests/kernel/Makefile                 |  8 +++++---
 tests/kernel/tty/Makefile             |  6 ++++--
 tests/lib/libc/sys/Makefile           |  4 ++--
 tests/lib/semaphore/pthread/Makefile  |  4 ++--
 tests/libexec/Makefile                |  4 +++-
 tests/modules/Makefile                |  4 ++--
 tests/net/bpf/Makefile                |  4 ++--
 tests/net/bpfilter/Makefile           |  4 ++--
 tests/net/carp/Makefile               |  4 ++--
 tests/net/icmp/Makefile               |  4 ++--
 tests/net/if/Makefile                 |  4 ++--
 tests/net/if_loop/Makefile            |  4 ++--
 tests/net/net/Makefile                |  6 +++---
 tests/rump/rumpkern/Makefile          |  4 ++--
 tests/rump/rumpkern/h_server/Makefile |  4 ++--
 tests/rump/rumpvfs/Makefile           |  4 ++--
 25 files changed, 59 insertions(+), 50 deletions(-)

diffs (truncated from 446 to 300 lines):

diff -r 77bfbd09dc92 -r 4046372dfc92 tests/dev/scsipi/Makefile
--- a/tests/dev/scsipi/Makefile Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/dev/scsipi/Makefile Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2014/04/25 00:24:39 pooka Exp $
+#      $NetBSD: Makefile,v 1.6 2014/06/10 04:28:39 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -18,6 +18,7 @@
 LDADD+= -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs
 LDADD+=        -lrump -lutil
 LDADD+=        -lrumpuser -lpthread
+LDADD+= -lrump
 
 WARNS= 4
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/dev/sysmon/Makefile
--- a/tests/dev/sysmon/Makefile Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/dev/sysmon/Makefile Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/12/20 04:56:18 pgoyette Exp $
+#      $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -9,7 +9,9 @@
 
 LDADD+=        -lrumpdev_sysmon -lrumpdev -lrumpvfs
 LDADD+=        -lrump
-LDADD+=        -lrumpuser -lpthread
+LDADD+=        -lrumpuser
+LDADD+=        -lrump
+LDADD+=        -lpthread
 
 WARNS= 4
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/kernfs/Makefile
--- a/tests/fs/kernfs/Makefile  Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/kernfs/Makefile  Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/06/08 10:43:40 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/kernfs
@@ -9,6 +9,6 @@
 .include <bsd.own.mk>
 
 LDADD+=        -lrumpfs_kernfs                                         # fs driver
-LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lrump -lpthread            # base
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/nfs/Makefile
--- a/tests/fs/nfs/Makefile     Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/nfs/Makefile     Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2012/02/24 13:53:46 joerg Exp $
+#      $NetBSD: Makefile,v 1.9 2014/06/10 04:28:39 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -22,7 +22,7 @@
 LDADD+=-lrumpdev_disk -lrumpdev                                 # disk device
 LDADD+=-lrumpnet_shmif                                                 # shmif
 LDADD+=-lrumpnet_netinet -lrumpnet_net -lrumpnet
-LDADD+=-lrump -lrumpuser -lpthread                             # base
+LDADD+=-lrump -lrumpuser -lrump -lpthread                      # base
 
 LDADD+=-lutil
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/nullfs/Makefile
--- a/tests/fs/nullfs/Makefile  Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/nullfs/Makefile  Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/04/10 21:33:01 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/nullfs
@@ -7,6 +7,6 @@
 TESTS_C=       t_basic
 
 LDADD+=        -lrumpfs_tmpfs -lrumpfs_null -lrumpvfs_layerfs          # fs drivers
-LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lrump -lpthread            # base
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/ptyfs/Makefile
--- a/tests/fs/ptyfs/Makefile   Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/ptyfs/Makefile   Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2011/10/13 17:23:29 plunky Exp $
+#      $NetBSD: Makefile,v 1.5 2014/06/10 04:28:39 he Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/ptyfs
@@ -9,7 +9,7 @@
 
 LDADD+=        -lrumpfs_ptyfs                                          # fs drivers
 LDADD+=        -lrumpkern_tty                                          # tty support
-LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lrump -lpthread            # base
 
 LDADD.t_nullpts+= -lrumpfs_null -lrumpvfs_layerfs
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/puffs/Makefile
--- a/tests/fs/puffs/Makefile   Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/puffs/Makefile   Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2010/11/12 17:35:34 pooka Exp $
+#      $NetBSD: Makefile,v 1.14 2014/06/10 04:28:39 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -18,7 +18,7 @@
 LDADD+=                -lrumpfs_syspuffs -lrumpvfs_fifofs
 LDADD+=                -lrumpnet_local -lrumpnet_net -lrumpnet
 LDADD+=                -lrumpvfs
-LDADD+=                -lrump -lrumpuser -lpthread
+LDADD+=                -lrump -lrumpuser -lrump -lpthread
 
 # required by -DPUFFSDUMP
 #LDADD+=       -lpuffs -lutil
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/umapfs/Makefile
--- a/tests/fs/umapfs/Makefile  Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/umapfs/Makefile  Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/04/11 05:45:57 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/umapfs
@@ -7,6 +7,6 @@
 TESTS_C=       t_basic
 
 LDADD+=        -lrumpfs_tmpfs -lrumpfs_umap -lrumpvfs_layerfs          # fs drivers
-LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lrump -lpthread            # base
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/fs/union/Makefile
--- a/tests/fs/union/Makefile   Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/fs/union/Makefile   Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/01/12 21:13:26 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
 #
 
 TESTSDIR=      ${TESTSBASE}/fs/union
@@ -8,6 +8,6 @@
 
 LDADD+=        -lrumpfs_union -lrumpvfs_layerfs -lrumpfs_ffs           # fs drivers
 LDADD+=        -lrumpdev_disk -lrumpdev                                # disk device
-LDADD+=        -lrumpvfs -lrump -lrumpuser -lpthread                   # base
+LDADD+=        -lrumpvfs -lrump -lrumpuser -lrump -lpthread            # base
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/kernel/Makefile
--- a/tests/kernel/Makefile     Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/kernel/Makefile     Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/04/16 22:05:44 mlelstv Exp $
+# $NetBSD: Makefile,v 1.34 2014/06/10 04:28:39 he Exp $
 
 NOMAN=         # defined
 
@@ -32,9 +32,11 @@
 TESTS_C+=      t_extattrctl
 TESTS_C+=      t_filedesc
 TESTS_C+=      t_rnd
-LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_extattrctl+= -lrumpvfs -lrump -lrumpuser
+LDADD.t_extattrctl+= -lrump -lpthread
 LDADD.t_filedesc+=  ${LDADD.t_rnd}
-LDADD.t_rnd+=  -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser -lpthread
+LDADD.t_rnd+=  -lrumpvfs -lrumpdev_rnd -lrumpdev -lrump -lrumpuser
+LDADD.t_rnd+=  -lrump -lpthread
 
 .endif
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/kernel/tty/Makefile
--- a/tests/kernel/tty/Makefile Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/kernel/tty/Makefile Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/06/28 19:04:00 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:39 he Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,8 @@
 
 TESTS_C=       t_pr
 
-LDADD+=                -lrumpkern_tty -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+=                -lrumpkern_tty -lrumpvfs -lrump -lrumpuser
+LDADD+=                -lrump
+LDADD+=                -lpthread
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/lib/libc/sys/Makefile
--- a/tests/lib/libc/sys/Makefile       Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/lib/libc/sys/Makefile       Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/07/24 11:45:48 skrll Exp $
+# $NetBSD: Makefile,v 1.35 2014/06/10 04:28:39 he Exp $
 
 MKMAN= no
 
@@ -70,7 +70,7 @@
 
 .if (${MKRUMP} != "no")
 TESTS_C+=              t_posix_fadvise
-LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD.t_posix_fadvise+= -lrumpvfs -lrump -lrumpuser -lrump -lpthread
 .endif
 
 WARNS=                 4
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/lib/semaphore/pthread/Makefile
--- a/tests/lib/semaphore/pthread/Makefile      Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/lib/semaphore/pthread/Makefile      Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/10 21:58:49 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/06/10 04:28:39 he Exp $
 
 .include <bsd.own.mk>
 
@@ -8,7 +8,7 @@
 
 CPPFLAGS+=     -I${.CURDIR}/..
 
-LDADD+=                -lrump -lrumpuser -lpthread
+LDADD+=                -lrump -lrumpuser -lrump -lpthread
 
 WARNS= 4
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/libexec/Makefile
--- a/tests/libexec/Makefile    Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/libexec/Makefile    Tue Jun 10 04:28:39 2014 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2011/06/11 18:03:19 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:39 he Exp $
 #
 .include "Makefile.inc"
 .include <bsd.own.mk>
 
+.if ${MACHINE_ARCH} != "m68000"
 TESTS_SUBDIRS=         ld.elf_so
+.endif
 
 TESTSDIR=      ${TESTSBASE}/libexec
 
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/modules/Makefile
--- a/tests/modules/Makefile    Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/modules/Makefile    Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/04/13 07:05:32 jruoho Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/10 04:28:40 he Exp $
 
 .include <bsd.own.mk>
 
@@ -12,7 +12,7 @@
 TESTS_C=       t_modctl
 TESTS_C+=      t_builtin
 LDADD=         -lprop
-LDADD+=                -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+=                -lrumpfs_kernfs -lrumpvfs -lrump -lrumpuser -lrump -lpthread
 
 TESTS_SH=      t_abi_uvm
 TESTS_SH+=     t_modload
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/net/bpf/Makefile
--- a/tests/net/bpf/Makefile    Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/net/bpf/Makefile    Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/01/03 02:53:15 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/06/10 04:28:40 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -10,6 +10,6 @@
 
 LDADD+=                -lrumpnet_shmif
 LDADD+=                -lrumpdev_bpf -lrumpdev -lrumpnet_netinet -lrumpnet_net
-LDADD+=                -lrumpnet -lrumpvfs -lrump -lrumpuser -lpthread
+LDADD+=                -lrumpnet -lrumpvfs -lrump -lrumpuser -lrump -lpthread
 
 .include <bsd.test.mk>
diff -r 77bfbd09dc92 -r 4046372dfc92 tests/net/bpfilter/Makefile
--- a/tests/net/bpfilter/Makefile       Tue Jun 10 03:47:57 2014 +0000
+++ b/tests/net/bpfilter/Makefile       Tue Jun 10 04:28:39 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/08/14 19:09:15 alnsn Exp $
+# $NetBSD: Makefile,v 1.2 2014/06/10 04:28:40 he Exp $
 #
 
 .include <bsd.own.mk>
@@ -9,6 +9,6 @@
 
 LDADD+=                -lrumpnet_shmif