diff options
| author | Jeff Darcy <jdarcy@fb.com> | 2017-05-11 13:29:46 -0700 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@fb.com> | 2017-05-11 13:31:56 -0700 |
| commit | 10bf2a1292dec01b0378a9ab33c11a531b15ac62 (patch) | |
| tree | a564b673de7fb92ccc46126b57408d40edf29e2f /tests | |
| parent | bc7df6287a79a817579b9f925b9e97cd997201f3 (diff) | |
Build/test fixes
(1) The version of gcc on my devserver doesn't seem to like plain
"inline" (in AHA) so I replaced it with "extern inline" which is a
better idea anyway.
(2) Fixed up some stuff to do with finding env.rc
(3) Added "nfsvers=3,proto=tcp" so that NFS tests run (a little bit)
better on my machine. Never hurts to be explicit, I guess.
Change-Id: I3357b61a950c0d1ef3dfd2c12c96d157c4d163e2
Signed-off-by: Jeff Darcy <jdarcy@fb.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/include.rc | 6 | ||||
| -rw-r--r-- | tests/nfs.rc | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/include.rc b/tests/include.rc index 9f32e88f5f5..56d0aa44b9f 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -21,11 +21,11 @@ OSTYPE=$(uname -s) M0LOG=${M0LOG:="mnt-glusterfs-0.log"}; # Log file for 0th FUSE mount point -ENV_RC=$(dirname $0)/../env.rc +ENV_RC=$(dirname $0)/env.rc if [ ! -f $ENV_RC ]; then - ENV_RC=$(dirname $0)/../../env.rc + ENV_RC=$(dirname $0)/../env.rc if [ ! -f $ENV_RC ]; then - ENV_RC=$(dirname $0)/../../../env.rc + ENV_RC=$(dirname $0)/../../env.rc fi fi diff --git a/tests/nfs.rc b/tests/nfs.rc index 2140f311c33..feb493bc866 100644 --- a/tests/nfs.rc +++ b/tests/nfs.rc @@ -23,7 +23,7 @@ function mount_nfs () local m=$2 local opt=$3 if [ ! -z "$opt" ]; then opt=",$opt"; fi - opt="soft,intr,vers=3$opt" + opt="soft,intr,nfsvers=3,proto=tcp$opt" nopt="" for o in ${opt//,/ }; do @@ -61,6 +61,7 @@ function mount_nfs () nopt="${nopt}$o" done + echo mount -t nfs -o $nopt $e $m > /dev/tty mount -t nfs -o $nopt $e $m } |