From: David Disseldorp <ddiss@sgi.com>
Date: Thu, 21 Dec 2006 02:54:16 +0000 (+0000)
Subject: use _filter_repair when running xfs_repair. This stops timestamp mismatches from... 
X-Git-Tag: v1.1.0~539
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f08eebda41d671aa0b78d8a7d11d41c0e4b8a266;p=xfstests-dev.git

use _filter_repair when running xfs_repair. This stops timestamp mismatches from causing test failures.
Merge of master-melb:xfs-cmds:27793a by kenmcd.

  pipe repair output through _filter_repair
---

diff --git a/031 b/031
index 2afeac7f..779cf27c 100755
--- a/031
+++ b/031
@@ -21,6 +21,7 @@ rm -f $seq.full
 
 # get standard environment, filters and checks
 . ./common.rc
+. ./common.repair
 . ./common.filter
 
 # link correct .out file
@@ -28,14 +29,15 @@ _link_out_file $seq.out
 
 _check_repair()
 {
-	_scratch_xfs_repair >$tmp.0 2>&1
+	echo "Repairing, round 0" >> $seq.full
+	_scratch_xfs_repair 2>&1 | _filter_repair | tee -a $seq.full >$tmp.0
 	for i in 1 2 3 4
 	do
 		echo "Repairing, iteration $i" | tee -a $seq.full
-		_scratch_xfs_repair 2>&1 | tee -a $seq.full >$tmp.$i
+		_scratch_xfs_repair 2>&1 | _filter_repair >$tmp.$i
 		diff $tmp.0 $tmp.$i >> $seq.full
 		if [ $? -ne 0 ]; then
-			echo "ERROR: repair round $i differs (see $seq.full)"
+			echo "ERROR: repair round $i differs to round 0 (see $seq.full)" | tee -a $seq.full
 			break
 		fi
 		# echo all interesting stuff...