common.dump: filter out latest xfsdump version messages
authorBrian Foster <bfoster@redhat.com>
Mon, 18 Jun 2012 16:48:00 +0000 (11:48 -0500)
committerEric Sandeen <sandeen@sandeen.net>
Mon, 18 Jun 2012 16:48:00 +0000 (11:48 -0500)
The latest version of xfsdump/restore (3.1.0) causes dump tests
to complain. Fix up the filter to include a wider selection of
version numbers.

Signed-off-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
common.dump

index ca09ec16d8925e25a7310b77163013be4b0f8623..e89dedcfe77d2d17fd36aad8bd58655ae61c10e7 100644 (file)
@@ -863,7 +863,7 @@ _dump_filter_main()
       -e 's/1048576/BLOCKSZ/'                          \
       -e 's/2097152/BLOCKSZ/'                          \
       -e 's/(pid[       ]*[1-9][0-9]*)/\(pid PID\)/'   \
       -e 's/1048576/BLOCKSZ/'                          \
       -e 's/2097152/BLOCKSZ/'                          \
       -e 's/(pid[       ]*[1-9][0-9]*)/\(pid PID\)/'   \
-      -e '/version 3\.0/d'                             \
+      -e '/version [3-9]\.[0-9]/d'                     \
       -e 's/\/hw\/module.*$/SCRATCH_DEV/'              \
       -e 's/xfsdump: ino map phase 1: .*/xfsdump: ino map <PHASES>/' \
       -e '/xfsdump: ino map phase [2]/,1d'             \
       -e 's/\/hw\/module.*$/SCRATCH_DEV/'              \
       -e 's/xfsdump: ino map phase 1: .*/xfsdump: ino map <PHASES>/' \
       -e '/xfsdump: ino map phase [2]/,1d'             \