Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 24 Oct 2014 03:53:50 +0000 (UTC)
From:      Garrett Cooper <ngie@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r273574 - head/contrib/netbsd-tests/lib/libc/sys
Message-ID:  <201410240353.s9O3roYD055416@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Fri Oct 24 03:53:49 2014
New Revision: 273574
URL: https://svnweb.freebsd.org/changeset/base/273574

Log:
  - Test for EINVAL requirement when passing an invalid flag in to msync(2)
  - Expect ENOMEM instead of EFAULT when msync'ing a previously munmap'ed region
    on FreeBSD
  
  Submitted by: pho
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/contrib/netbsd-tests/lib/libc/sys/t_msync.c

Modified: head/contrib/netbsd-tests/lib/libc/sys/t_msync.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_msync.c	Fri Oct 24 03:48:54 2014	(r273573)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_msync.c	Fri Oct 24 03:53:49 2014	(r273574)
@@ -170,8 +170,15 @@ ATF_TC_BODY(msync_err, tc)
 	/*
 	 * Test that invalid flags error out.
 	 */
+#ifdef __FreeBSD__
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, msync_sync("error", -1) != NULL);
+	errno = 0;
+	ATF_REQUIRE_ERRNO(EINVAL, msync_sync("error", INT_MAX) != NULL);
+#else
 	ATF_REQUIRE(msync_sync("error", -1) != NULL);
 	ATF_REQUIRE(msync_sync("error", INT_MAX) != NULL);
+#endif
 
 	errno = 0;
 
@@ -185,7 +192,11 @@ ATF_TC_BODY(msync_err, tc)
 	(void)munmap(map, page);
 
 	ATF_REQUIRE(msync(map, page, MS_SYNC) != 0);
+#ifdef __FreeBSD__
+	ATF_REQUIRE(errno == ENOMEM);
+#else
 	ATF_REQUIRE(errno == EFAULT);
+#endif
 }
 
 ATF_TC(msync_invalidate);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410240353.s9O3roYD055416>