From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> In this test we use fsstress to create some number of files and then exercise xfsdump/xfsrestore on them. Depending on the fsstress config we may end up with a different number of files than is hardcoded in the golden output (particularly after adding reflink support to fsstress) and thereby fail the test. Since we're not really testing how many files fsstress can create, just turn the counts into XXX/YYY. Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> --- tests/xfs/068 | 4 +++- tests/xfs/068.out | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/xfs/068 b/tests/xfs/068 index 7151e28..119b204 100755 --- a/tests/xfs/068 +++ b/tests/xfs/068 @@ -44,7 +44,9 @@ _supported_fs xfs _supported_os Linux _create_dumpdir_stress_num 4096 -_do_dump_restore +# Fancy filtering here because fsstress doesn't always create the +# same number of files (depending on the fs geometry) +_do_dump_restore | sed -e 's/xfsrestore: [0-9]* directories and [0-9]* entries/xfsrestore: XXX directories and YYY entries/g' # success, all done exit diff --git a/tests/xfs/068.out b/tests/xfs/068.out index fa3a552..f53c555 100644 --- a/tests/xfs/068.out +++ b/tests/xfs/068.out @@ -22,7 +22,7 @@ xfsrestore: session id: ID xfsrestore: media ID: ID xfsrestore: searching media for directory dump xfsrestore: reading directories -xfsrestore: 383 directories and 1335 entries processed +xfsrestore: XXX directories and YYY entries processed xfsrestore: directory post-processing xfsrestore: restoring non-directory files xfsrestore: restore complete: SECS seconds elapsed -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
