XFSQA 073 is still not correctly cleaning up $tmp,

this is because $tmp.source_dir is not an empty dir.

This change recursively deletes everything in $tmp.source_dir.
Not required for $tmp.loop as it is used as a loopback mountpoint.

the ignore external MKFS_OPTIONS change is no longer required,
as _scratch_mkfs_xfs now handles conflicting options.
Merge of master-melb:xfs-cmds:28863a by kenmcd.

  cleanup tmp and don't kill mkfs options

diff --git a/073 b/073
index 1d6919addd9e3a56c97c357bc6d7d98fd4741272..d38ff910812a79d1e695e2ec776f7e4f35692abf 100755 (executable)
--- a/073
+++ b/073
@@ -22,7 +22,7 @@ _cleanup()
        umount $SCRATCH_MNT 2>/dev/null
        umount $tmp.loop 2>/dev/null
        [ -d $tmp.loop ] && rmdir $tmp.loop
-       [ -d $tmp.source_dir ] && rmdir $tmp.source_dir
+       [ -d $tmp.source_dir ] && rm -rf $tmp.source_dir
        rm -f $tmp.* /var/tmp/xfs_copy.log.*
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -114,7 +114,6 @@ _supported_os Linux
 _require_scratch
 _require_loop
 
-MKFS_OPTIONS="" #ignore external MKFS_OPTIONS
 _scratch_mkfs_xfs -dsize=41m,agcount=2 | _filter_mkfs 2>/dev/null
 _scratch_mount 2>/dev/null || _fail "initial scratch mount failed"