From 549ec4ae72869769126062b86e99648f9ea127d5 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Fri, 15 Mar 2013 11:53:26 +0000 Subject: [PATCH] xfstests: always use test option when checking large scratch device Some tests call _check_scratch_device directly and when using a large filesystem this needs to run with a -t option to avoid consuming large amounts of memory. Make this happen in all cases that the scratch device is checked. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Rich Johnston Signed-off-by: Rich Johnston --- 017 | 7 ++----- common.rc | 2 ++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/017 b/017 index 7db46675..fb923750 100755 --- a/017 +++ b/017 @@ -48,9 +48,6 @@ _supported_os Linux _require_scratch -checkopts="" -[ "$USE_BIG_LOOPFS" = yes ] && checkopts=-t - echo "*** init FS" rm -f $seq.full @@ -82,8 +79,8 @@ do echo "" >>$seq.full echo "*** XFS_CHECK ***" >>$seq.full echo "" >>$seq.full - _scratch_xfs_check $checkopts >>$seq.full 2>&1 \ - || _fail "xfs_check $checkopts failed" + _scratch_xfs_check >>$seq.full 2>&1 \ + || _fail "xfs_check failed" _scratch_mount -o remount,rw \ || _fail "remount rw failed" done diff --git a/common.rc b/common.rc index ee4f5228..10265725 100644 --- a/common.rc +++ b/common.rc @@ -475,6 +475,8 @@ _scratch_xfs_check() SCRATCH_OPTIONS="" [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \ SCRATCH_OPTIONS="-l $SCRATCH_LOGDEV" + [ "$LARGE_SCRATCH_DEV" = yes ] && \ + SCRATCH_OPTIONS=$SCRATCH_OPTIONS" -t" $XFS_CHECK_PROG $SCRATCH_OPTIONS $* $SCRATCH_DEV } -- 2.39.5