From: Willem Jan Withagen <wjw@digiware.nl>
Date: Sat, 21 Sep 2019 12:43:30 +0000 (+0200)
Subject: test/libcephfs: Only use sys/xattr.h on Linux
X-Git-Tag: v14.2.5~37^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0be0fdfdd1ddccc7e77e19b145215dc8ce24b1d2;p=ceph.git

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 606e4156288..7c75dac2e16 100644
--- 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 b9286929acd..cac42f33fb9 100644
--- 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 a9a800d00aa..a6c4a65963d 100644
--- 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 4af9b418d2e..b4976c9c3ef 100644
--- 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 36c0346d49b..1a6376ee5e1 100644
--- 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 179109de25b..465bbd8f772 100644
--- 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 e019dd25a64..7b2f7b7694f 100644
--- 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 9dd0e1c69eb..0b7a967df4d 100644
--- 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>