porting: various fixes regression tests OSX/FreeBSD

- `wc -l` on OSX/FreeBSD adds spurious spaces, this clobbers
  up TAP output parsers - fix it.
- `umount -l` doesn't exist on OSX/FreeBSD use 'umount -f' if
   available.
- Add check for 'file' version, to handle mime type variations
  across versions
- Converge 'glusterfs --attribute-timeout=0 --entry-timeout=0'
  into '$GFS'
- Modify remaining 'mount -t nfs' to use 'mount_nfs'
- Update sha1sum for OSX to use 'openssl sha1'.

Change-Id: Id1012faa5d67a921513d220e7fa9cebafe830d34
BUG: 1131713
Signed-off-by: Harshavardhana <harsha@harshavardhana.net>
Reviewed-on: http://review.gluster.org/8501
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

4 files changed, 9 insertions, 11 deletions

diff --git a/tests/basic/ec/ec-common b/tests/basic/ec/ec-common
index 89b972b147a..800734881c6 100644
--- a/tests/basic/ec/ec-common
+++ b/tests/basic/ec/ec-common
@@ -1,4 +1,3 @@
-
 SIZE_LIST="1048576 1000 12345 0"
 
 LAST_BRICK=$(($DISPERSE - 1))
@@ -23,7 +22,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 redundancy $REDUNDANCY $H0:$B0/${V0}{0..$LAST_BRICK}
 TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
 
 TEST dd if=/dev/urandom of=$tmp/small bs=1024 count=1
 TEST dd if=/dev/urandom of=$tmp/big bs=1024 count=4096
@@ -88,7 +87,7 @@ for dir in . dir1; do
         TEST umount $M0
         TEST $CLI volume stop $V0 force
         TEST $CLI volume start $V0
-        TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+        TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
         cd $M0
     done
 
diff --git a/tests/basic/ec/ec.t b/tests/basic/ec/ec.t
index d069fac4fec..569f4c7098a 100644
--- a/tests/basic/ec/ec.t
+++ b/tests/basic/ec/ec.t
@@ -140,7 +140,7 @@ TEST $CLI volume start $V0
 EXPECT 'Started' volinfo_field $V0 'Status'
 
 # Mount FUSE with caching disabled
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0
+TEST $GFS -s $H0 --volfile-id $V0 $M0
 
 # Create local files for comparisons etc.
 tmpdir=$(mktemp -d -t ${0##*/}.XXXXXX)
@@ -185,7 +185,7 @@ TEST setup_perm_file $M0
 
 # Unmount/remount so that create/write and truncate don't see cached data.
 TEST umount $M0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0
+TEST $GFS -s $H0 --volfile-id $V0 $M0
 
 # Test create/write and truncate *before* the bricks are brought back.
 TEST check_create_write $M0
@@ -197,7 +197,7 @@ sleep 10
 
 # Unmount/remount again, same reason as before.
 TEST umount $M0
-TEST glusterfs --entry-timeout=0 --attribute-timeout=0 -s $H0 --volfile-id $V0 $M0
+TEST $GFS -s $H0 --volfile-id $V0 $M0
 
 # Make sure everything is as it should be.  Most tests check for consistency
 # between the bricks and the front end.  This is not valid for disperse, so we
@@ -230,4 +230,3 @@ rm -rf $tmpdir
 userdel --force ${TEST_USER}
 
 cleanup
-
diff --git a/tests/basic/ec/nfs.t b/tests/basic/ec/nfs.t
index b2e51c03af5..ebc8f9fcbce 100644
--- a/tests/basic/ec/nfs.t
+++ b/tests/basic/ec/nfs.t
@@ -11,11 +11,11 @@ TEST $CLI volume create $V0 redundancy 2 $H0:$B0/${V0}{0..5}
 TEST $CLI volume start $V0
 
 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available;
-TEST mount_nfs $H0:/$V0 $N0
+TEST mount_nfs $H0:/$V0 $N0 nolock
 
 TEST dd if=/dev/zero of=$N0/test bs=1024k count=1k
 
 ## Before killing daemon to avoid deadlocks
-EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0  
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" umount_nfs $N0
 
 cleanup
diff --git a/tests/basic/ec/self-heal.t b/tests/basic/ec/self-heal.t
index f3f2cc23d3f..ba28b7d82f5 100644
--- a/tests/basic/ec/self-heal.t
+++ b/tests/basic/ec/self-heal.t
@@ -18,7 +18,7 @@ TEST glusterd
 TEST pidof glusterd
 TEST $CLI volume create $V0 redundancy 2 $H0:$B0/${V0}{0..5}
 TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
 
 TEST dd if=/dev/urandom of=$tmp/test bs=1024 count=1024
 
@@ -96,7 +96,7 @@ cd
 TEST umount $M0
 TEST $CLI volume stop $V0 force
 TEST $CLI volume start $V0
-TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
 cd $M0
 
 EXPECT "1048576" stat -c "%s" test2