test/libcephfs: fix rebasing issues

Signed-off-by: Rishabh Dave <ridave@redhat.com>

diff --git a/src/test/libcephfs/access.cc b/src/test/libcephfs/access.cc
index dd4f33ab079366222b4030beb2a9186d7fa746ed..cebbb34eff73c878577b832ff817730608c09dbf 100644 (file)
--- a/src/test/libcephfs/access.cc
+++ b/src/test/libcephfs/access.cc
@@ -29,6 +29,8 @@
 #include <vector>
 #include "json_spirit/json_spirit.h"
 
+#include "include/fs_types.h"
+
 #ifdef __linux__
 #include <limits.h>
 #include <sys/xattr.h>

diff --git a/src/test/libcephfs/test.cc b/src/test/libcephfs/test.cc
index 3fb301ea72fae4efd408540f4ec4a24c5675efba..5028f1ac44b870d307ba1615684380d5f546791b 100644 (file)
--- a/src/test/libcephfs/test.cc
+++ b/src/test/libcephfs/test.cc
@@ -2457,7 +2457,8 @@ TEST(LibCephFS, SnapXattrs) {
   ASSERT_LT(alen, xbuflen);
   gxattrv[alen] = '\0';
   char *s = strchr(gxattrv, '.');
-  ASSERT_NE(0, s);
+  char *q = NULL;
+  ASSERT_NE(q, s);
   ASSERT_LT(s, gxattrv + alen);
   ASSERT_EQ('.', *s);
   *s = '\0';
@@ -2485,7 +2486,7 @@ TEST(LibCephFS, SnapXattrs) {
   ASSERT_LT(alen, xbuflen);
   gxattrv2[alen] = '\0';
   s = strchr(gxattrv2, '.');
-  ASSERT_NE(0, s);
+  ASSERT_NE(q, s);
   ASSERT_LT(s, gxattrv2 + alen);
   ASSERT_EQ('.', *s);
   *s = '\0';