[Xen-devel] [OSSTEST PATCH 2/4] line wrapping: Use tmp/$flight.report in two extra places

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

The output from sg-report-flight might in principle contain long
lines, although this is not expected.  So we are going to want to feed
it through the new cr-fold-long-lines.

Rather than piping, we are going to keep a copy of the .report file,
like is done in mg-execute-flight.  So for now, just make that change.

No overall change other than to leave behind the tmp/$flight.report
file.  It will be tidied up by the usual cleanup processes.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 cri-args-hostlists | 3 ++-
 cri-bisect         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cri-args-hostlists b/cri-args-hostlists
index 7d230875..a788e095 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -119,7 +119,8 @@ start_email () {
 
        ./sg-report-flight --html-dir=$flight_html_dir/$flight/ \
                --allow=allow.all --allow=allow.$branch \
-               $sgr_args $flight
+               $sgr_args $flight >tmp/$flight.report
+       cat tmp/$flight.report
 
        mkdir -p $host_html_dir
        with-lock-ex -w $globallockdir/report-lock \
diff --git a/cri-bisect b/cri-bisect
index 28a8659a..f8fc55a8 100644
--- a/cri-bisect
+++ b/cri-bisect
@@ -107,7 +107,8 @@ END
                if [ "x$OSSTEST_HTMLPUB_DIR" != x ]; then
                        sgr_args+=" --html-dir=$OSSTEST_HTMLPUB_DIR/$flight/"
                fi
-                ./sg-report-flight $sgr_args >&3 $flight
+                ./sg-report-flight $sgr_args $flight >tmp/$flight.report
+               cat tmp/$flight.report >&3
                 ./cr-publish-flight-logs --push-harness $flight
         fi
         exec 3>&-
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel