Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Oct 2014 07:54:47 +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: r273533 - head/contrib/netbsd-tests/lib/libc/sys
Message-ID:  <201410230754.s9N7slW1082117@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ngie
Date: Thu Oct 23 07:54:46 2014
New Revision: 273533
URL: https://svnweb.freebsd.org/changeset/base/273533

Log:
  Use <atf_srcdir>/truncate_test.root_owned instead of /usr/bin/fpr as fpr does
  not exist on FreeBSD
  
  truncate_test.root_owned will be generated at build time and owned by root
  
  In collaboration with: pho
  Sponsored by: EMC / Isilon Storage Division

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

Modified: head/contrib/netbsd-tests/lib/libc/sys/t_truncate.c
==============================================================================
--- head/contrib/netbsd-tests/lib/libc/sys/t_truncate.c	Thu Oct 23 07:37:48 2014	(r273532)
+++ head/contrib/netbsd-tests/lib/libc/sys/t_truncate.c	Thu Oct 23 07:54:46 2014	(r273533)
@@ -40,6 +40,10 @@ __RCSID("$NetBSD: t_truncate.c,v 1.2 201
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
+#include <limits.h>
+#endif
+
 static const char path[] = "truncate";
 static const size_t sizes[] = { 8, 16, 512, 1024, 2048, 4094, 3000, 30 };
 
@@ -149,6 +153,9 @@ ATF_TC_HEAD(truncate_err, tc)
 
 ATF_TC_BODY(truncate_err, tc)
 {
+#ifndef __NetBSD__
+	char buf[PATH_MAX];
+#endif
 
 	errno = 0;
 	ATF_REQUIRE_ERRNO(EFAULT, truncate((void *)-1, 999) == -1);
@@ -160,7 +167,13 @@ ATF_TC_BODY(truncate_err, tc)
 	ATF_REQUIRE_ERRNO(ENOENT, truncate("/a/b/c/d/e/f/g", 999) == -1);
 
 	errno = 0;
+#ifdef __NetBSD__
 	ATF_REQUIRE_ERRNO(EACCES, truncate("/usr/bin/fpr", 999) == -1);
+#else
+	snprintf(buf, sizeof(buf), "%s/truncate_test.root_owned",
+	    atf_tc_get_config_var(tc, "srcdir"));
+	ATF_REQUIRE_ERRNO(EACCES, truncate(buf, 999) == -1);
+#endif
 }
 
 ATF_TP_ADD_TCS(tp)



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