These tests only run on Mac; put all the code behind conditionals.

diff --git a/libarchive/test/test_write_disk_appledouble.c b/libarchive/test/test_write_disk_appledouble.c
index 502fac316473d28557aa5280b8a4c95456910fe3..81032fca9cd077b7085ebb48a16346aefece7b4a 100644 (file)
--- a/libarchive/test/test_write_disk_appledouble.c
+++ b/libarchive/test/test_write_disk_appledouble.c
@@ -33,6 +33,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/xattr.h>
 #endif
 
+#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
+       && defined(HAVE_ZLIB_H)
+
 //
 // The test ACL used here is sometimes assigned to the 'Guest' user
 // This changes the text and breaks the test.  This function simply
@@ -59,8 +62,6 @@ clean_acl(const char *acl) {
        return _acl_temp;
 }
 
-#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
-       && defined(HAVE_ZLIB_H)
 static int
 has_xattr(const char *filename, const char *xattrname)
 {

diff --git a/libarchive/test/test_write_disk_mac_metadata.c b/libarchive/test/test_write_disk_mac_metadata.c
index eb2bd5633c6b0bab40c17f28403b6ce0095468b9..6e9e72365e138fb1a1f60c857ea5da9848bc8586 100644 (file)
--- a/libarchive/test/test_write_disk_mac_metadata.c
+++ b/libarchive/test/test_write_disk_mac_metadata.c
@@ -33,6 +33,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/xattr.h>
 #endif
 
+
+#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
+       && defined(HAVE_ZLIB_H)
 //
 // The test ACL used here is sometimes assigned to the 'Guest' user
 // This changes the text and breaks the test.  This function simply
@@ -59,8 +62,6 @@ clean_acl(const char *acl) {
        return _acl_temp;
 }
 
-#if defined(__APPLE__) && defined(UF_COMPRESSED) && defined(HAVE_SYS_XATTR_H)\
-       && defined(HAVE_ZLIB_H)
 static int
 has_xattr(const char *filename, const char *xattrname)
 {