022: ignore fsstress file count

The recently added fsstress operations result in a different
number of directories and files being created for xfsdump test
022, which causes the test to fail since the expected xfsrestore
output records these numbers. Filter out the numbers to prevent
this from breaking in the future.

Also increase the number of fsstress operations used to populate
the filesystem so that we get roughly the same number of
directories and files as we used to for this test.

Reviewed-by: Alex Elder <aelder@sgi.com>
Signed-off-by: Bill Kendall <wkendall@sgi.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/022 b/022
index 76d18e6c81e1b1b3ff4982e8d7f8fb826e28b267..b83b0632158f648b6a8c82efb7ffc279baff3d4f 100755 (executable)
--- a/022
+++ b/022
@@ -53,7 +53,8 @@ _require_tape $TAPE_DEV
 _create_dumpdir_stress
 _erase_hard
 _do_dump_sub
-_do_restore
+# filter out the file count, it changes as fsstress adds new operations
+_do_restore | sed -e "/entries processed$/s/[0-9][0-9]*/NUM/g"
 _ls_compare_sub
 
 # success, all done

diff --git a/022.out.irix b/022.out.irix
index 725d6cd78c1e8c3ffdbaaaeec4a299ee5c7f15c0..f72876aababe96a147f00333c296b3e547763fa4 100644 (file)
--- a/022.out.irix
+++ b/022.out.irix
@@ -46,7 +46,7 @@ xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
-xfsrestore: 30 directories and 89 entries processed
+xfsrestore: NUM directories and NUM entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/022.out.linux b/022.out.linux
index 94667476d7d47193597d307b62d3c2fb1be10e3a..a843b0c3905fc8655cb0f29142a3eeba3cc2ec2a 100644 (file)
--- a/022.out.linux
+++ b/022.out.linux
@@ -46,7 +46,7 @@ xfsrestore: searching media for directory dump
 xfsrestore: preparing drive
 xfsrestore: examining media file 0
 xfsrestore: reading directories
-xfsrestore: 30 directories and 89 entries processed
+xfsrestore: NUM directories and NUM entries processed
 xfsrestore: directory post-processing
 xfsrestore: restoring non-directory files
 xfsrestore: restore complete: SECS seconds elapsed

diff --git a/common.dump b/common.dump
index 31a75c57353b186eccc1119e72f85a627505a2f8..493a5f7bf627e03069bd0061365be5d502589cfd 100644 (file)
--- a/common.dump
+++ b/common.dump
@@ -301,7 +301,7 @@ _create_dumpdir_stress()
     _wipe_fs
 
     _param="-f link=10 -f creat=10 -f mkdir=10 -f truncate=5 -f symlink=10"
-    _count=200
+    _count=240
     rm -rf $dump_dir
     if ! mkdir $dump_dir; then
         echo "    failed to mkdir $dump_dir"