From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 18 Apr 2010 23:42:28 +0000 (-0400)
Subject: If the local filesystem is set up for NFS4 ACLs, then the POSIX.1e ACL test should... 
X-Git-Tag: v3.0.0a~1097
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0fdae78f0c10cf44d7fd7ca03eac3ba956223082;p=thirdparty%2Flibarchive.git

If the local filesystem is set up for NFS4 ACLs, then the POSIX.1e ACL test should be skipped.

SVN-Revision: 2265
---

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 54c9e1643..dd095da51 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -364,6 +364,9 @@ test_skipping(const char *fmt, ...)
 	va_start(ap, fmt);
 	vsprintf(buff, fmt, ap);
 	va_end(ap);
+	/* Use failure() message if set. */
+	msg = nextmsg;
+	nextmsg = NULL;
 	/* failure_start() isn't quite right, but is awfully convenient. */
 	failure_start(test_filename, test_line, "SKIPPING: %s", buff);
 	--failures; /* Undo failures++ in failure_start() */
diff --git a/libarchive/test/test_acl_freebsd.c b/libarchive/test/test_acl_freebsd.c
index 8529ca9fb..1680f9f80 100644
--- a/libarchive/test/test_acl_freebsd.c
+++ b/libarchive/test/test_acl_freebsd.c
@@ -220,6 +220,11 @@ DEFINE_TEST(test_acl_freebsd)
 		skipping("ACL tests require that ACL support be enabled on the filesystem");
 		return;
 	}
+	if (n != 0 && errno == EINVAL) {
+		close(fd);
+		skipping("This filesystem does not support POSIX.1e ACLs");
+		return;
+	}
 	failure("acl_set_fd(): errno = %d (%s)",
 	    errno, strerror(errno));
 	assertEqualInt(0, n);