xfs: fix $XFS_DB_PROG usage

xfs_db requires us to pass in the log device, if any; this can be
accomplished via _scratch_xfs_db_options (if we're operating on the
scratch device, anyway).  However, many of the tests/xfs/ scripts
pass only $SCRATCH_DEV directly, so they'll fail if we test with an
external log.  Fix that by adding a new _scratch_xfs_db helper.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Darrick J. Wong
2016-09-29 19:23:41 -07:00
committed by Eryu Guan
parent fff869cb9c
commit c08ebd092d
37 changed files with 137 additions and 137 deletions
+1 -1
View File
@@ -60,7 +60,7 @@ _scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed"
# (the log is zeroed when cycle == 1).
for i in 16 32 64 128 256; do
lsunit=$((i * 1024))
$XFS_DB_PROG -x -c "logformat -c 3 -s $lsunit" $SCRATCH_DEV | \
_scratch_xfs_db -x -c "logformat -c 3 -s $lsunit" | \
tee -a $seqres.full
# don't redirect error output so it causes test failure
$XFS_LOGPRINT_PROG $SCRATCH_DEV >> $seqres.full