]> git-server-git.apps.pok.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
xfstests: exit out if _scratch_mount fails
authorJosef Bacik <jbacik@fusionio.com>
Tue, 9 Jul 2013 19:07:27 +0000 (15:07 -0400)
committerBen Myers <bpm@sgi.com>
Fri, 19 Jul 2013 20:38:10 +0000 (15:38 -0500)
I test some of the different mkfs options for btrfs, one set doesn't work
properly with small file systems, so the fs won't mount.  This is fine from a
btrfs point of view, but tests that fail to mount the scratch fs will run
anyway, so if it's a "fill the fs" sort of test this will wreak havoc.  To fix
this just error out of _scratch_mount fails.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Reviewed-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>
common/rc

index fe6bbfcbfc553e60c7c7683afc3349518d71acdd..5cb1fe22e45fb7626b438e8d030b62e87a4045db 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -276,6 +276,10 @@ _scratch_mount_options()
 _scratch_mount()
 {
     _mount -t $FSTYP `_scratch_mount_options $*`
+    if [ $? -ne 0 ]; then
+       echo "mount failed"
+       exit 1
+    fi
 }
 
 _scratch_unmount()