test/libcephfs: Only use sys/xattr.h on Linux

For compatibility add XATTR_CREATE to include/compat.h

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
(cherry picked from commit 1e9e5ec9f1138eda593f0a51f010d0a1a6009487)

Conficts:
    src/test/libcephfs/lazyio.cc
    This file does not exist in Nautilus, so not fixed.

diff --git a/src/include/compat.h b/src/include/compat.h
index 606e4156288823f68785a1e1b597450e1f46c677..7c75dac2e16b0823315039fc6818c219a4f0ffc8 100644 (file)
--- a/src/include/compat.h
+++ b/src/include/compat.h
@@ -99,6 +99,9 @@ int sched_setaffinity(pid_t pid, size_t cpusetsize,
 #ifndef EKEYREJECTED
 #define EKEYREJECTED 129
 #endif
+#ifndef XATTR_CREATE
+#define XATTR_CREATE 1
+#endif
 
 #ifndef HOST_NAME_MAX
 #ifdef MAXHOSTNAMELEN 

diff --git a/src/test/libcephfs/access.cc b/src/test/libcephfs/access.cc
index b9286929acd57c734a13044c9ca4b9f934b646cc..cac42f33fb9c062f37c8080a206ef8067663adfd 100644 (file)
--- a/src/test/libcephfs/access.cc
+++ b/src/test/libcephfs/access.cc
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <sys/xattr.h>
 #include <sys/uio.h>
 #include <iostream>
 #include <vector>
@@ -32,6 +31,7 @@
 
 #ifdef __linux__
 #include <limits.h>
+#include <sys/xattr.h>
 #endif
 
 

diff --git a/src/test/libcephfs/acl.cc b/src/test/libcephfs/acl.cc
index a9a800d00aae8c21e87dea96a0ee12d0e4ee3531..a6c4a65963d92778645610b7d264a9bdde1885bb 100644 (file)
--- a/src/test/libcephfs/acl.cc
+++ b/src/test/libcephfs/acl.cc
@@ -21,7 +21,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef __linux__
 #include <sys/xattr.h>
+#endif
 
 static size_t acl_ea_size(int count)
 {

diff --git a/src/test/libcephfs/caps.cc b/src/test/libcephfs/caps.cc
index 4af9b418d2e8345dd36aa6d6752369e1cfc9472f..b4976c9c3effb5ab2224afceca1025300cc53480 100644 (file)
--- a/src/test/libcephfs/caps.cc
+++ b/src/test/libcephfs/caps.cc
@@ -22,7 +22,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#ifdef __linux__
 #include <sys/xattr.h>
+#endif
 #include <signal.h>
 
 TEST(Caps, ReadZero) {

diff --git a/src/test/libcephfs/deleg.cc b/src/test/libcephfs/deleg.cc
index 36c0346d49bef6af2cda351b50a5417cdacd0c0f..1a6376ee5e19a632d81fe6d731e923643e3e1603 100644 (file)
--- a/src/test/libcephfs/deleg.cc
+++ b/src/test/libcephfs/deleg.cc
@@ -15,11 +15,11 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <sys/xattr.h>
 #include <sys/uio.h>
 
 #ifdef __linux__
 #include <limits.h>
+#include <sys/xattr.h>
 #endif
 
 #include <map>

diff --git a/src/test/libcephfs/multiclient.cc b/src/test/libcephfs/multiclient.cc
index 179109de25b0bdc5132f048f43c72caf09e40f4f..465bbd8f77246f0362d55b5a16ed8ba5b8fc37a4 100644 (file)
--- a/src/test/libcephfs/multiclient.cc
+++ b/src/test/libcephfs/multiclient.cc
@@ -20,7 +20,9 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
+#ifdef __linux__
 #include <sys/xattr.h>
+#endif
 
 TEST(LibCephFS, MulticlientSimple) {
   struct ceph_mount_info *ca, *cb;

diff --git a/src/test/libcephfs/reclaim.cc b/src/test/libcephfs/reclaim.cc
index e019dd25a6443d4d80cb0fa647467e3a529a305f..7b2f7b7694f283df7d7c03534ce0318758642f13 100644 (file)
--- a/src/test/libcephfs/reclaim.cc
+++ b/src/test/libcephfs/reclaim.cc
@@ -15,15 +15,19 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <sys/xattr.h>
 #include <sys/uio.h>
 #include <libgen.h>
 #include <stdlib.h>
 
 #ifdef __linux__
+#include <sys/xattr.h>
 #include <limits.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#endif
+
 
 #include <map>
 #include <vector>

diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index 9dd0e1c69ebe25f3db5b84f4797606290766ac35..0b7a967df4d360406240a1b6253649ffad3fde10 100644 (file)
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -12,6 +12,7 @@
  *
  */
 
+#include "include/compat.h"
 #include "gtest/gtest.h"
 #include "include/cephfs/libcephfs.h"
 #include "include/stat.h"
@@ -21,7 +22,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
-#include <sys/xattr.h>
 #include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/resource.h>
@@ -30,6 +30,7 @@
 
 #ifdef __linux__
 #include <limits.h>
+#include <sys/xattr.h>
 #endif
 
 #include <map>