@@ -714,12 +714,21 @@ for section in $HOST_OPTIONS_SECTIONS; do
cat $seqres.notrun
notrun="$notrun $seqnum"
else
+ # Check for diff skip.
+ # Some tests, like performance ones, has no "right" output,
+ # so there is no reason to diff it. It is saved instead.
+ skip_diff=false
+ if [ -f $seqres.no_output_check ];then
+ skip_diff=true
+ rm $seqres.no_output_check
+ fi
+
if [ $sts -ne 0 ]
then
echo -n " [failed, exit status $sts]"
err=true
fi
- if [ ! -f $seq.out ]
+ if [ ! -f $seq.out -a $skip_diff = false ]
then
echo " - no qualified output"
err=true
@@ -728,7 +737,8 @@ for section in $HOST_OPTIONS_SECTIONS; do
# coreutils 8.16+ changed quote formats in error messages from
# `foo' to 'foo'. Filter old versions to match the new version.
sed -i "s/\`/\'/g" $tmp.out
- if diff $seq.out $tmp.out >/dev/null 2>&1
+ if (test $skip_diff = true) \
+ || diff $seq.out $tmp.out >/dev/null 2>&1
then
if $err
then
@@ -737,6 +747,12 @@ for section in $HOST_OPTIONS_SECTIONS; do
echo "$seqnum `expr $stop - $start`" >>$tmp.time
echo -n " `expr $stop - $start`s"
fi
+ # if diff was skipped, we want to have the output saved
+ if test $skip_diff = true
+ then
+ mv $tmp.out $seqres.out
+ echo -n " Output saved per request of the test."
+ fi
echo ""
else
echo " - output mismatch (see $seqres.out.bad)"
@@ -75,6 +75,22 @@ _get_lists_intersect()
echo $intersect
}
+# Tell the check script that it should not check output
+# of a test, but should always save it.
+#
+_disable_output_check()
+{
+ touch $seqres.no_output_check
+}
+
+# Tell the check script that it should check output
+# of a test. Revert the effect of "_disable_output_check()" call.
+#
+_enable_output_check()
+{
+ rm $seqres.no_output_check
+}
+
dd()
{
if [ "$HOSTOS" == "Linux" ]
The performance tests has no "right" output for diff. Thus, this patch allows tests to opt-out of output diffs and to have their full output always saved into the results directory. Changes are both in check script and common/rc. Signed-off-by: Jan ?ulák <jtulak@redhat.com> --- check | 20 ++++++++++++++++++-- common/rc | 16 ++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-)