Module Name: src
Committed By: sborrill
Date: Fri Jun 15 08:53:33 UTC 2012
Modified Files:
src/tests/lib/libc/sys [netbsd-6]: t_mmap.c
Log Message:
Pull up the following revisions(s) (requested by bouyer in ticket #345):
tests/lib/libc/sys/t_mmap.c: revision 1.7
Disable the mmap_block test again. It is only by accident that it doesn't
panic when mmaping /dev/wd0d. PR kern/46592
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/tests/lib/libc/sys/t_mmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_mmap.c
diff -u src/tests/lib/libc/sys/t_mmap.c:1.2.4.1 src/tests/lib/libc/sys/t_mmap.c:1.2.4.2
--- src/tests/lib/libc/sys/t_mmap.c:1.2.4.1 Mon Jun 11 21:25:02 2012
+++ src/tests/lib/libc/sys/t_mmap.c Fri Jun 15 08:53:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mmap.c,v 1.2.4.1 2012/06/11 21:25:02 riz Exp $ */
+/* $NetBSD: t_mmap.c,v 1.2.4.2 2012/06/15 08:53:32 sborrill Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -55,7 +55,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: t_mmap.c,v 1.2.4.1 2012/06/11 21:25:02 riz Exp $");
+__RCSID("$NetBSD: t_mmap.c,v 1.2.4.2 2012/06/15 08:53:32 sborrill Exp $");
#include <sys/param.h>
#include <sys/mman.h>
@@ -170,8 +170,7 @@ ATF_TC_BODY(mmap_block, tc)
size_t len;
int fd = -1;
- atf_tc_expect_signal(SIGSEGV, "mmap of block devices does not work "
- "(PR kern/38889)");
+ atf_tc_skip("The test case causes a panic (PR kern/38889, kern/46592)");
ATF_REQUIRE(sysctl(mib, miblen, NULL, &len, NULL, 0) == 0);
drives = malloc(len);
