[PATCH] xfs: fix merge errors in fuzzer tests
Darrick J. Wong
darrick.wong at oracle.com
Mon Sep 28 17:38:01 CDT 2015
Fix some merge errors when the fuzzer tests went in.
Signed-off-by: Darrick J. Wong <darrick.wong at oracle.com>
---
tests/xfs/085.out | 2 --
tests/xfs/098.out | 1 -
tests/xfs/099.out | 2 +-
tests/xfs/100.out | 2 +-
tests/xfs/101.out | 2 +-
tests/xfs/102.out | 2 +-
6 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tests/xfs/085.out b/tests/xfs/085.out
index 6303081..ff3dccd 100644
--- a/tests/xfs/085.out
+++ b/tests/xfs/085.out
@@ -5,8 +5,6 @@ QA output created by 085
+ check fs
+ corrupt image
+ mount image
-+ modify files
-broken: 1
+ repair fs
+ mount image (2)
+ chattr -R -i
diff --git a/tests/xfs/098.out b/tests/xfs/098.out
index 84a2b4d..ef0554d 100644
--- a/tests/xfs/098.out
+++ b/tests/xfs/098.out
@@ -5,7 +5,6 @@ QA output created by 098
+ check fs
+ corrupt image
+ mount image
-broken: 1
+ repair fs
+ mount image (2)
+ chattr -R -i
diff --git a/tests/xfs/099.out b/tests/xfs/099.out
index 4426859..773200b 100644
--- a/tests/xfs/099.out
+++ b/tests/xfs/099.out
@@ -1,4 +1,4 @@
-QA output created by 016
+QA output created by 099
+ create scratch fs
+ mount fs image
+ make some files
diff --git a/tests/xfs/100.out b/tests/xfs/100.out
index 98d8dbc..97dba7c 100644
--- a/tests/xfs/100.out
+++ b/tests/xfs/100.out
@@ -1,4 +1,4 @@
-QA output created by 017
+QA output created by 100
+ create scratch fs
+ mount fs image
+ make some files
diff --git a/tests/xfs/101.out b/tests/xfs/101.out
index 49430f7..22ca620 100644
--- a/tests/xfs/101.out
+++ b/tests/xfs/101.out
@@ -1,4 +1,4 @@
-QA output created by 018
+QA output created by 101
+ create scratch fs
+ mount fs image
+ make some files
diff --git a/tests/xfs/102.out b/tests/xfs/102.out
index 58f493c..d8a8fa1 100644
--- a/tests/xfs/102.out
+++ b/tests/xfs/102.out
@@ -1,4 +1,4 @@
-QA output created by 019
+QA output created by 102
+ create scratch fs
+ mount fs image
+ make some files
More information about the xfs
mailing list