From: Christoph Hellwig <hch@lst.de>
Date: Tue, 7 Jul 2009 14:20:59 +0000 (+0200)
Subject: don't print scratch mkfs and mount options without scratch device
X-Git-Tag: v1.1.0~254
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=40690b12d189ac84cef720580ef2ff840997306b;p=xfstests-dev.git

don't print scratch mkfs and mount options without scratch device

Also clean up the way the test configuration is printed.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/check b/check
index 1aae528c..5768be68 100755
--- a/check
+++ b/check
@@ -161,18 +161,15 @@ rm -f check.full
 
 [ -f check.time ] || touch check.time
 
-FULL_FSTYP_DETAILS=`_full_fstyp_details`
-FULL_HOST_DETAILS=`_full_platform_details`
-FULL_MKFS_OPTIONS=`_scratch_mkfs_options`
-FULL_MOUNT_OPTIONS=`_scratch_mount_options`
-
-cat <<EOF
-FSTYP         -- $FULL_FSTYP_DETAILS
-PLATFORM      -- $FULL_HOST_DETAILS
-MKFS_OPTIONS  -- $FULL_MKFS_OPTIONS
-MOUNT_OPTIONS -- $FULL_MOUNT_OPTIONS
-
-EOF
+# print out our test configuration
+echo "FSTYP         -- `_full_fstyp_details`"
+echo "PLATFORM      -- `_full_platform_details`"
+if [ ! -z "$SCRATCH_DEV" ]; then
+  echo "MKFS_OPTIONS  -- `_scratch_mkfs_options`"
+  echo "MOUNT_OPTIONS -- `_scratch_mount_options`"
+fi
+echo
+
 
 if [ ! -z "$SCRATCH_DEV" ]; then
   umount $SCRATCH_DEV 2>/dev/null