From: Bill Kendall <wkendall@sgi.com>
Date: Mon, 7 Nov 2011 21:03:52 +0000 (-0600)
Subject: 022: ignore fsstress file count
X-Git-Tag: v2022.05.01~3645
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17b803d584b5a19372974c651a92986893633d64;p=xfstests-dev.git

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 76d18e6c..b83b0632 100755
--- 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 725d6cd7..f72876aa 100644
--- 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 94667476..a843b0c3 100644
--- 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 31a75c57..493a5f7b 100644
--- 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"