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>
This commit is contained in:
Boris Ranto
2011-03-08 13:29:20 +00:00
committed by Alex Elder
parent 195df5adfb
commit 9c931b32fb
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -34,6 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
_cleanup_testdir
}