build: MacOSX Porting fixes

git@forge.gluster.org:~schafdog/glusterfs-core/osx-glusterfs

Working functionality on MacOSX

 - GlusterD (management daemon)
 - GlusterCLI (management cli)
 - GlusterFS FUSE (using OSXFUSE)
 - GlusterNFS (without NLM - issues with rpc.statd)

Change-Id: I20193d3f8904388e47344e523b3787dbeab044ac
BUG: 1089172
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Signed-off-by: Dennis Schafroth <dennis@schafroth.com>
Tested-by: Harshavardhana <harsha@harshavardhana.net>
Tested-by: Dennis Schafroth <dennis@schafroth.com>
Reviewed-on: http://review.gluster.org/7503
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

5 files changed, 12 insertions, 5 deletions

diff --git a/tests/basic/pgfid-feat.t b/tests/basic/pgfid-feat.t
index 8784cc7bf0e..3978f9c97b2 100644
--- a/tests/basic/pgfid-feat.t
+++ b/tests/basic/pgfid-feat.t
@@ -24,11 +24,10 @@ TEST $CLI volume set $V0 build-pgfid on;
 TEST mkdir $M0/a;
 TEST touch $M0/a/b;
 
-getfattr -e text -n glusterfs.ancestry.path "$M0/a/b" | grep "^glusterfs.ancestry.path" | cut -d"=" -f2 | tr -d \";
 EXPECT "/a/b" get_ancestry_path "/a/b";
 
 TEST $CLI volume set $V0 build-pgfid off;
-TEST ! getfattr -e text -n "glusterfs.ancestry.path" $M0/a/b;
+EXPECT "" get_ancestry_path "/a/b";
 
 TEST $CLI volume stop $V0;
 TEST $CLI volume delete $V0;
diff --git a/tests/basic/volume-snapshot.t b/tests/basic/volume-snapshot.t
index c826631cad9..e6c47f0d527 100755
--- a/tests/basic/volume-snapshot.t
+++ b/tests/basic/volume-snapshot.t
@@ -5,6 +5,7 @@
 . $(dirname $0)/../cluster.rc
 . $(dirname $0)/../snapshot.rc
 
+
 V1="patchy2"
 
 function create_volumes() {
@@ -48,6 +49,7 @@ function restore_snapshots() {
 }
 cleanup;
 
+TEST verify_lvm_version;
 #Create cluster with 3 nodes
 TEST launch_cluster 3;
 TEST setup_lvm 3
@@ -92,4 +94,3 @@ TEST ! volume_exists $V0
 TEST ! volume_exists $V1
 
 cleanup;
-
diff --git a/tests/bugs/bug-1045333.t b/tests/bugs/bug-1045333.t
index 8f4798ebc23..f5985d29cba 100755
--- a/tests/bugs/bug-1045333.t
+++ b/tests/bugs/bug-1045333.t
@@ -4,6 +4,7 @@
 . $(dirname $0)/../snapshot.rc
 
 cleanup;
+TEST verify_lvm_version;
 TEST glusterd;
 TEST pidof glusterd;
 
diff --git a/tests/bugs/bug-1049834.t b/tests/bugs/bug-1049834.t
index c1b126ba1b1..eea3297ed56 100755
--- a/tests/bugs/bug-1049834.t
+++ b/tests/bugs/bug-1049834.t
@@ -6,7 +6,7 @@
 . $(dirname $0)/../snapshot.rc
 
 cleanup;
-
+TEST verify_lvm_version
 TEST launch_cluster 2
 TEST setup_lvm 2
 
diff --git a/tests/snapshot.rc b/tests/snapshot.rc
index 440059fc1af..87ea0df9190 100755
--- a/tests/snapshot.rc
+++ b/tests/snapshot.rc
@@ -46,6 +46,13 @@ function init_lvm() {
     return 0
 }
 
+function verify_lvm_version() {
+    if `/sbin/lvcreate --help | grep -q thin`; then
+        return 0;
+    fi
+    return 1;
+}
+
 function setup_lvm() {
     init_lvm $@ || return 1
     _setup_lvm
@@ -287,4 +294,3 @@ function volume_exists() {
                 return 0
         fi
 }
-