From 2dd53eb4de91c25817af85475cfa9ff66e79c97b Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Tue, 19 Aug 2014 18:24:23 -0700 Subject: 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 Reviewed-on: http://review.gluster.org/8501 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- tests/basic/afr/read-subvol-data.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/basic/afr/read-subvol-data.t') diff --git a/tests/basic/afr/read-subvol-data.t b/tests/basic/afr/read-subvol-data.t index 0c4b366331d..39f43a15028 100644 --- a/tests/basic/afr/read-subvol-data.t +++ b/tests/basic/afr/read-subvol-data.t @@ -13,7 +13,7 @@ TEST $CLI volume set $V0 self-heal-daemon off TEST $CLI volume set $V0 stat-prefetch off TEST $CLI volume start $V0 TEST $CLI volume set $V0 cluster.background-self-heal-count 0 -TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0 --entry-timeout=0 --attribute-timeout=0; +TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0; #Test TEST $CLI volume set $V0 cluster.read-subvolume $V0-client-1 -- cgit