diff options
author | Harshavardhana <harsha@harshavardhana.net> | 2014-08-19 18:24:23 -0700 |
---|---|---|
committer | Harshavardhana <harsha@harshavardhana.net> | 2014-08-29 09:13:02 -0700 |
commit | 2dd53eb4de91c25817af85475cfa9ff66e79c97b (patch) | |
tree | 1fce885b03af9a07d797dfac92f9ecd24817617e /tests/basic/quota.t | |
parent | 04be6a47df5c7d5c04c84fed06df9a8a1652c582 (diff) | |
download | glusterfs-2dd53eb4de91c25817af85475cfa9ff66e79c97b.tar.gz glusterfs-2dd53eb4de91c25817af85475cfa9ff66e79c97b.tar.xz glusterfs-2dd53eb4de91c25817af85475cfa9ff66e79c97b.zip |
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>
Diffstat (limited to 'tests/basic/quota.t')
-rwxr-xr-x | tests/basic/quota.t | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/basic/quota.t b/tests/basic/quota.t index 1d23cfc868..d5a95e2181 100755 --- a/tests/basic/quota.t +++ b/tests/basic/quota.t @@ -4,6 +4,7 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc . $(dirname $0)/../dht.rc +. $(dirname $0)/../nfs.rc cleanup; @@ -40,7 +41,7 @@ EXPECT '4' brick_count $V0 TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -TEST glusterfs -s $H0 --volfile-id $V0 $M0; +TEST $GFS -s $H0 --volfile-id $V0 $M0; TEST mkdir -p $M0/test_dir/in_test_dir |