diff options
Diffstat (limited to 'contrib/netbsd-tests/rump')
| -rw-r--r-- | contrib/netbsd-tests/rump/modautoload/t_modautoload.c | 15 | ||||
| -rw-r--r-- | contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c | 3 | ||||
| -rw-r--r-- | contrib/netbsd-tests/rump/rumpkern/t_lwproc.c | 4 | ||||
| -rwxr-xr-x | contrib/netbsd-tests/rump/rumpkern/t_sp.sh | 7 | ||||
| -rwxr-xr-x | contrib/netbsd-tests/rump/rumpnet/t_shmif.sh | 4 | ||||
| -rw-r--r-- | contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c | 3 |
6 files changed, 27 insertions, 9 deletions
diff --git a/contrib/netbsd-tests/rump/modautoload/t_modautoload.c b/contrib/netbsd-tests/rump/modautoload/t_modautoload.c index f28ad55..2c21a90 100644 --- a/contrib/netbsd-tests/rump/modautoload/t_modautoload.c +++ b/contrib/netbsd-tests/rump/modautoload/t_modautoload.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_modautoload.c,v 1.2 2014/03/10 22:38:53 pooka Exp $ */ +/* $NetBSD: t_modautoload.c,v 1.5 2016/09/14 03:19:11 ozaki-r Exp $ */ #include <sys/types.h> #include <sys/mount.h> @@ -33,6 +33,9 @@ ATF_TC_HEAD(modautoload, tc) static void mountkernfs(void) { + bool old_autoload, new_autoload; + size_t old_len, new_len; + int error; if (!rump_nativeabi_p()) atf_tc_skip("host kernel modules not supported"); @@ -41,6 +44,16 @@ mountkernfs(void) if (rump_sys_mkdir("/kern", 0777) == -1) atf_tc_fail_errno("mkdir /kern"); + + new_autoload = true; + old_len = sizeof(old_autoload); + new_len = sizeof(new_autoload); + error = sysctlbyname("kern.module.autoload", + &old_autoload, &old_len, + &new_autoload, new_len); + if (error != 0) + atf_tc_fail_errno("could not enable module autoload"); + if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1) atf_tc_fail_errno("could not mount kernfs"); } diff --git a/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c b/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c index 4e04c22..0ab3958 100644 --- a/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c +++ b/contrib/netbsd-tests/rump/rumpkern/h_server/h_simpleserver.c @@ -1,10 +1,11 @@ -/* $NetBSD: h_simpleserver.c,v 1.3 2011/01/14 13:23:15 pooka Exp $ */ +/* $NetBSD: h_simpleserver.c,v 1.4 2016/01/25 12:21:42 pooka Exp $ */ #include <sys/types.h> #include <rump/rump.h> #include <err.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c b/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c index dcdfdb6..6e78d02 100644 --- a/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c +++ b/contrib/netbsd-tests/rump/rumpkern/t_lwproc.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_lwproc.c,v 1.5 2011/01/02 12:58:17 pooka Exp $ */ +/* $NetBSD: t_lwproc.c,v 1.8 2017/01/10 22:36:29 christos Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -29,6 +29,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <sys/stat.h> #include <rump/rump.h> #include <rump/rump_syscalls.h> @@ -88,6 +89,7 @@ ATF_TC_BODY(proccreds, tc) rump_init(); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l1 = rump_pub_lwproc_curlwp(); + RZ(rump_pub_lwproc_newlwp(rump_sys_getpid())); RZ(rump_pub_lwproc_rfork(RUMP_RFCFDG)); l2 = rump_pub_lwproc_curlwp(); diff --git a/contrib/netbsd-tests/rump/rumpkern/t_sp.sh b/contrib/netbsd-tests/rump/rumpkern/t_sp.sh index 9d11d2a..2c4404a 100755 --- a/contrib/netbsd-tests/rump/rumpkern/t_sp.sh +++ b/contrib/netbsd-tests/rump/rumpkern/t_sp.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_sp.sh,v 1.12 2014/08/30 12:14:17 gson Exp $ +# $NetBSD: t_sp.sh,v 1.13 2016/08/10 23:47:14 kre Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -73,7 +73,8 @@ stress() export RUMP_SERVER=unix://commsock atf_check -s exit:0 rump_server \ - -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet ${RUMP_SERVER} + -lrumpvfs -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpdev \ + ${RUMP_SERVER} atf_check -s exit:0 -e ignore $(atf_get_srcdir)/h_client/h_stresscli $@ } @@ -81,7 +82,7 @@ fork() { export RUMP_SERVER=unix://commsock - atf_check -s exit:0 rump_server -lrumpvfs ${RUMP_SERVER} + atf_check -s exit:0 rump_server -lrumpvfs -lrumpdev ${RUMP_SERVER} atf_check -s exit:0 $(atf_get_srcdir)/h_client/h_forkcli ${1} } diff --git a/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh b/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh index dc463f2..4de8b4f 100755 --- a/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh +++ b/contrib/netbsd-tests/rump/rumpnet/t_shmif.sh @@ -1,4 +1,4 @@ -# $NetBSD: t_shmif.sh,v 1.2 2013/09/09 19:27:49 pooka Exp $ +# $NetBSD: t_shmif.sh,v 1.3 2016/08/10 23:49:03 kre Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -39,7 +39,7 @@ startserver() export RUMP_SERVER=unix://sock${1} atf_check -s exit:0 rump_server -lrumpnet -lrumpnet_net \ - -lrumpnet_netinet -lrumpnet_shmif ${RUMP_SERVER} + -lrumpnet_netinet -lrumpnet_shmif -lrumpdev ${RUMP_SERVER} atf_check -s exit:0 rump.ifconfig shmif0 create atf_check -s exit:0 rump.ifconfig shmif0 linkstr shmbus atf_check -s exit:0 rump.ifconfig shmif0 inet 1.1.1.${1} diff --git a/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c b/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c index 735c607..c94e5e1 100644 --- a/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c +++ b/contrib/netbsd-tests/rump/rumpvfs/t_p2kifs.c @@ -1,4 +1,4 @@ -/* $NetBSD: t_p2kifs.c,v 1.4 2014/02/07 15:29:23 hannken Exp $ */ +/* $NetBSD: t_p2kifs.c,v 1.5 2016/01/25 11:45:57 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -32,6 +32,7 @@ #include <sys/sysctl.h> #include <rump/rump.h> +#include <rump/rumpvnode_if.h> #include <rump/rump_syscalls.h> #include <atf-c.h> |
