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/ec/ec-common | |
| parent | 04be6a47df5c7d5c04c84fed06df9a8a1652c582 (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 <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/ec/ec-common')
| -rw-r--r-- | tests/basic/ec/ec-common | 5 |
1 files changed, 2 insertions, 3 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 |