[src/netbsd-6]: src/tests/lib/libc/sys Pull up the following revisions(s) (re...

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

details:   https://anonhg.NetBSD.org/src/rev/81d17af7c912
branches:  netbsd-6
changeset: 774231:81d17af7c912
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Fri Jun 15 08:53:32 2012 +0000

description:
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

diffstat:

 tests/lib/libc/sys/t_mmap.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (28 lines):

diff -r f755ce775ff7 -r 81d17af7c912 tests/lib/libc/sys/t_mmap.c
--- a/tests/lib/libc/sys/t_mmap.c       Fri Jun 15 08:49:59 2012 +0000
+++ b/tests/lib/libc/sys/t_mmap.c       Fri Jun 15 08:53:32 2012 +0000
@@ -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 @@
        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);