xfstests: don't print scratch mkfs and mount options without scratch device
PATCH 1/1 xfstests: don't print scratch mkfs and mount options without scratch device
Also clean up the way the test configuration is printed.
check +8 -11
@@ -161,18 +161,15 @@ [ -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 +# 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 -EOF if [ ! -z "$SCRATCH_DEV" ]; then umount $SCRATCH_DEV 2>/dev/null
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
ping?
Quoted 37 lines · Christoph Hellwig
Also clean up the way the test configuration is printed.
Signed-off-by Christoph Hellwig <[email protected]>Index: xfstests-dev/check
===================================================================check +8
-11@@ -161,18 +161,15 @@ [ -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 +# 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 -EOF if [ ! -z "$SCRATCH_DEV" ]; then umount $SCRATCH_DEV 2>/dev/null
Quoted 4 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
---end quoted text---
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
Quoted 4 lines · Christoph Hellwig
Also clean up the way the test configuration is printed.
Signed-off-by Christoph Hellwig <[email protected]>
Quoted 32 lines
Index: xfstests-dev/check
===================================================================check +8
-11@@ -161,18 +161,15 @@ [ -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 +# 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 -EOF if [ ! -z "$SCRATCH_DEV" ]; then umount $SCRATCH_DEV 2>/dev/null
Quoted 5 lines
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs