From: Boris Ranto <branto@redhat.com>
Date: Tue, 8 Mar 2011 13:29:20 +0000 (+0000)
Subject: xfstests: change directory to / before _cleanup_testdir in test 135
X-Git-Tag: v1.1.0~81
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c931b32fbb1f09f0b74cb4f954d13270b54ff1b;p=users%2Fhch%2Fxfstests-dev.git

xfstests: change directory to / before _cleanup_testdir in test 135

Nfs tries to umount $testdir in _cleanup_testdir function. Tests 126
and 135 call the function from directory $SCRATCH_MNT that is equal
to $testdir (at least for nfs). The umount will therefore fail,
causing the test to fail due to the output mismatch.

Test 126 also does double a umount thanks to the call to _cleanup
before exit and the trap command.  So remove the unnecessary call of
the _cleanup function before exit.

Signed-off-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
---

diff --git a/126 b/126
index 44db64c62..c2348f4fc 100755
--- a/126
+++ b/126
@@ -34,6 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
+    cd /
     _cleanup_testdir
 }
 
@@ -73,5 +74,4 @@ $QA_FS_PERMS 040 99 99 99 500 r 1
 $QA_FS_PERMS 400 99 99 200 99 r 1
 
 status=0
-_cleanup
 exit
diff --git a/135 b/135
index 915701fdf..976619de3 100755
--- a/135
+++ b/135
@@ -34,6 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _cleanup()
 {
+    cd /
     _cleanup_testdir
 }