From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 24 Oct 2015 11:10:08 +0000 (-0700)
Subject: These tests only run on Mac; put all the code behind conditionals.
X-Git-Tag: v3.1.900a~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65be3e327749aa020250c78a41e3ceee75fa2745;p=thirdparty%2Flibarchive.git

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 502fac316..81032fca9 100644
--- 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 eb2bd5633..6e9e72365 100644
--- 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)
 {