From 69c0045e5869ae5171eca19ca21503b92c57611e Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 17 Apr 2017 14:52:05 +0000 Subject: [PATCH] rumpnet_net now needs rumpdev for config_cfdriver_attach. rumpdev in turn needs rumpvfs. --- tests/dynamic/dynamic.c | 4 ++++ tests/nettest_routed/Makefile | 2 +- tests/nettest_routed6/Makefile | 2 +- tests/nettest_simple/Makefile | 2 +- tests/nettest_simple6/Makefile | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/dynamic/dynamic.c b/tests/dynamic/dynamic.c index 7c58cc3..bf84563 100644 --- a/tests/dynamic/dynamic.c +++ b/tests/dynamic/dynamic.c @@ -17,6 +17,10 @@ main() int s; /* use this as a "do we have dynamic libs" test */ + if (dlopen("librumpvfs.so", RTLD_LAZY | RTLD_GLOBAL) == NULL) + return 37; + if (dlopen("librumpdev.so", RTLD_LAZY | RTLD_GLOBAL) == NULL) + return 37; if (dlopen("librumpnet.so", RTLD_LAZY | RTLD_GLOBAL) == NULL) return 37; diff --git a/tests/nettest_routed/Makefile b/tests/nettest_routed/Makefile index 76ee488..ee73825 100644 --- a/tests/nettest_routed/Makefile +++ b/tests/nettest_routed/Makefile @@ -1,7 +1,7 @@ PROG= nettest_routed RUMPLIBS= -lrumpnet_shmif -lrumpnet_config -lrumpnet_netinet -lrumpnet_net -RUMPLIBS+=-lrumpnet ${RUMPKERN_SYSPROXY} -lrump -lrumpuser +RUMPLIBS+=-lrumpnet -lrumpdev -lrumpvfs ${RUMPKERN_SYSPROXY} -lrump -lrumpuser CLEANFILES+= busmem1 busmem2 diff --git a/tests/nettest_routed6/Makefile b/tests/nettest_routed6/Makefile index a6d0bdc..0c374e3 100644 --- a/tests/nettest_routed6/Makefile +++ b/tests/nettest_routed6/Makefile @@ -4,7 +4,7 @@ PROG= nettest_routed6 SRCS= nettest_routed.c RUMPLIBS= -lrumpnet_shmif -lrumpnet_config -lrumpnet_netinet6 -lrumpnet_net -RUMPLIBS+=-lrumpnet ${RUMPKERN_SYSPROXY} -lrump -lrumpuser +RUMPLIBS+=-lrumpnet -lrumpdev -lrumpvfs ${RUMPKERN_SYSPROXY} -lrump -lrumpuser CLEANFILES+= busmem1 busmem2 diff --git a/tests/nettest_simple/Makefile b/tests/nettest_simple/Makefile index 57d8946..2e72bfb 100644 --- a/tests/nettest_simple/Makefile +++ b/tests/nettest_simple/Makefile @@ -1,7 +1,7 @@ PROG= nettest_simple RUMPLIBS= -lrumpnet_shmif -lrumpnet_config -lrumpnet_netinet -lrumpnet_net -RUMPLIBS+=-lrumpnet ${RUMPKERN_SYSPROXY} -lrump -lrumpuser +RUMPLIBS+=-lrumpnet -lrumpdev -lrumpvfs ${RUMPKERN_SYSPROXY} -lrump -lrumpuser CLEANFILES+= busmem diff --git a/tests/nettest_simple6/Makefile b/tests/nettest_simple6/Makefile index 40edb62..df3d051 100644 --- a/tests/nettest_simple6/Makefile +++ b/tests/nettest_simple6/Makefile @@ -4,7 +4,7 @@ PROG= nettest_simple6 SRCS= nettest_simple.c RUMPLIBS= -lrumpnet_shmif -lrumpnet_config -lrumpnet_netinet6 -lrumpnet_net -RUMPLIBS+=-lrumpnet ${RUMPKERN_SYSPROXY} -lrump -lrumpuser +RUMPLIBS+=-lrumpnet -lrumpdev -lrumpvfs ${RUMPKERN_SYSPROXY} -lrump -lrumpuser CLEANFILES+= busmem