In commit 11c1d79414e2571 "xfstests: Change the diff output of failed
tests", the diff output of a failed test was hardcoded to 10 lines to
avoid overly long output and user can get the full output by manually
running the diff. However this is not always possible and convenient,
eg. in repeated automated tests where the required information is lost
after the test round finished. Then the caputred logs do not contain
enough informatin for analysis.
Introduce the DIFF_LENGTH env variable to tune the diff size, keeping it
10 as deafult and 0 to disable the limit.
Signed-off-by: David Sterba <dsterba@xxxxxxx>
---
README | 2 ++
check | 7 ++++++-
common.config | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/README b/README
index d81ede9..b70f75d 100644
--- a/README
+++ b/README
@@ -63,6 +63,8 @@ Preparing system for tests (IRIX and Linux):
- if TEST_LOGDEV and/or TEST_RTDEV, these will always be used.
- if SCRATCH_LOGDEV and/or SCRATCH_RTDEV, the USE_EXTERNAL
environment variable set to "yes" will enable their use.
+ - setenv DIFF_LENGTH "number of diff lines to print from a failed test",
+ by default 10, set to 0 to print the full diff
- or add a case to the switch in common.config assigning
these variables based on the hostname of your test
machine
diff --git a/check b/check
index 75addb5..8b79678 100755
--- a/check
+++ b/check
@@ -287,7 +287,12 @@ do
else
echo " - output mismatch (see $seq.out.bad)"
mv $tmp.out $seq.out.bad
- $diff $seq.out $seq.out.bad | head -n 10 | \
+ $diff $seq.out $seq.out.bad | {
+ if [ "$DIFF_LENGTH" -le 0 ]; then
+ cat
+ else
+ head -n "$DIFF_LENGTH"
+ fi; } | \
sed -e 's/^\(.\)/ \1/'
echo " ..."
echo " (Run '$diff $seq.out $seq.out.bad' to see the" \
diff --git a/common.config b/common.config
index 57f505d..8dfe574 100644
--- a/common.config
+++ b/common.config
@@ -63,6 +63,8 @@ HOSTOS=`uname -s`
MODULAR=0 # using XFS as a module or not
BOOT="/boot" # install target for kernels
export EXTRA=${EXTRA:=xfs-qa}
+# number of diff lines from a failed test, 0 for whole output
+export DIFF_LENGTH=${DIFF_LENGTH:=10}
# general parameters (mainly for auto-qa)
SOAK_PROC=3 # -p option to fsstress
--
1.8.0.2
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
