[RESEND] report: gracefully handle XML report creation when no tests are run
diff mbox series

Message ID 20190609210431.26373-1-tytso@mit.edu
State New
Headers show
Series
  • [RESEND] report: gracefully handle XML report creation when no tests are run
Related show

Commit Message

Theodore Y. Ts'o June 9, 2019, 9:04 p.m. UTC
If no tests are run (because they have all been excluded) then make
sure we insert a valid timestamp into the XML file, and avoid printing
an error message when reading a non-existent test summary scratch
file.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

I sent this a while back, and didn't get any comments, so I'm resending.  PTAL.

 common/report | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Eryu Guan June 16, 2019, 1:22 p.m. UTC | #1
On Sun, Jun 09, 2019 at 05:04:31PM -0400, Theodore Ts'o wrote:
> If no tests are run (because they have all been excluded) then make
> sure we insert a valid timestamp into the XML file, and avoid printing
> an error message when reading a non-existent test summary scratch
> file.
> 
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> ---
> 
> I sent this a while back, and didn't get any comments, so I'm resending.  PTAL.

Sorry, I totally missed it.. applied now, thanks!

Eryu

> 
>  common/report | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/common/report b/common/report
> index fb00b402..6cac71fc 100644
> --- a/common/report
> +++ b/common/report
> @@ -59,6 +59,9 @@ _xunit_make_section_report()
>  	local report=$tmp.report.xunit.$sect_name.xml
>  	# Header
>  	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $REPORT_DIR/result.xml
> +	if [ -z "$date_time" ]; then
> +		date_time=$(date +"%F %T")
> +	fi
>  	local dtime=`echo $date_time| tr  " " 'T'`
>  	local stats="failures=\"$n_bad\" skipped=\"$n_notrun\" tests=\"$n_total\" time=\"$sect_time\""
>  	local hw_info="hostname=\"$HOST\" timestamp=\"$dtime\" "
> @@ -70,7 +73,9 @@ _xunit_make_section_report()
>  		_xunit_add_property "$p"
>  	done
>  	echo -e "\t</properties>" >> $REPORT_DIR/result.xml
> -	cat $tmp.report.xunit.$sect_name.xml >> $REPORT_DIR/result.xml
> +	if [ -f $report ]; then
> +		cat $report >> $REPORT_DIR/result.xml
> +	fi
>  	echo "</testsuite>" >> $REPORT_DIR/result.xml
>  	echo "Xunit report: $REPORT_DIR/result.xml"
>  }
> -- 
> 2.22.0
>

Patch
diff mbox series

diff --git a/common/report b/common/report
index fb00b402..6cac71fc 100644
--- a/common/report
+++ b/common/report
@@ -59,6 +59,9 @@  _xunit_make_section_report()
 	local report=$tmp.report.xunit.$sect_name.xml
 	# Header
 	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > $REPORT_DIR/result.xml
+	if [ -z "$date_time" ]; then
+		date_time=$(date +"%F %T")
+	fi
 	local dtime=`echo $date_time| tr  " " 'T'`
 	local stats="failures=\"$n_bad\" skipped=\"$n_notrun\" tests=\"$n_total\" time=\"$sect_time\""
 	local hw_info="hostname=\"$HOST\" timestamp=\"$dtime\" "
@@ -70,7 +73,9 @@  _xunit_make_section_report()
 		_xunit_add_property "$p"
 	done
 	echo -e "\t</properties>" >> $REPORT_DIR/result.xml
-	cat $tmp.report.xunit.$sect_name.xml >> $REPORT_DIR/result.xml
+	if [ -f $report ]; then
+		cat $report >> $REPORT_DIR/result.xml
+	fi
 	echo "</testsuite>" >> $REPORT_DIR/result.xml
 	echo "Xunit report: $REPORT_DIR/result.xml"
 }