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

SVN-Revision: 2265

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 54c9e164341804cf08d0d6a92ebbdc988f198637..dd095da51d5d6af0e29844fdc5d266f7e4bb67d7 100644 (file)
--- 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 8529ca9fb38c0159b6f8c2847afa7f65a9da5bc6..1680f9f80e553ea73d020e27970501faab84bb96 100644 (file)
--- 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);