path: root/tests/basic/uss.t
diff options
authorHarshavardhana <>2014-08-19 18:24:23 -0700
committerHarshavardhana <>2014-08-29 09:13:02 -0700
commit2dd53eb4de91c25817af85475cfa9ff66e79c97b (patch)
tree1fce885b03af9a07d797dfac92f9ecd24817617e /tests/basic/uss.t
parent04be6a47df5c7d5c04c84fed06df9a8a1652c582 (diff)
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: Tested-by: Gluster Build System <> Reviewed-by: Kaleb KEITHLEY <>
Diffstat (limited to 'tests/basic/uss.t')
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index ad7fcaf270a..729474b1529 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -19,7 +19,7 @@ TEST $CLI volume create $V0 $H0:$L1 $H0:$L2 $H0:$L3;
TEST $CLI volume start $V0;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
+TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0;
for i in {1..10} ; do echo "file" > $M0/file$i ; done
@@ -46,7 +46,7 @@ TEST $CLI volume set $V0 features.uss enable;
-TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0;
+TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0;
# test 15
TEST ls $M0/.snaps;