diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/gfid_unsplit.t | 4 | ||||
| -rw-r--r-- | tests/include.rc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/basic/gfid_unsplit.t b/tests/basic/gfid_unsplit.t index 9bb52f4533a..3fe7a6f140c 100644 --- a/tests/basic/gfid_unsplit.t +++ b/tests/basic/gfid_unsplit.t @@ -2,6 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../volume.rc +. $(dirname $0)/../nfs.rc cleanup; @@ -63,7 +64,8 @@ TEST [ "$MD5" == "$HEALED_MD5" ] TEST rm -f $M0/splitfile # Part II: NFS test -TEST mount -t nfs -o nolock,noatime,noacl,soft,intr $H0:/$V0 $N0; +TEST mount_nfs $H0:/$V0 $N0 nolock +#EST mount -t nfs -o nolock,noatime,noacl,soft,intr $H0:/$V0 $N0; dd if=/dev/urandom of=$N0/splitfile bs=128k count=5 2>/dev/null diff --git a/tests/include.rc b/tests/include.rc index 872aec11edf..8b6504e6c58 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -426,6 +426,7 @@ stat -c %s /dev/null > /dev/null 2>&1 || { function cleanup() { + local OLDPWD=$PWD cd # Things go pear-shaped if we're inside a Gluster mount. # Prepare flags for umount @@ -578,6 +579,8 @@ function cleanup() # above to fail, promoting that into a failure of the whole test (and # thus of an entire regression-test run) seems a bit excessive. Make # sure we return good status anyway. + + cd $OLDPWD return 0 } |