From a3bc9d6c82920f086346aef2b165fb8e49142828 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Thu, 28 Feb 2019 21:19:01 -0500 Subject: [PATCH] tests.sh: run junit2html to render xml files Signed-off-by: Jean Privat --- .gitlab-ci.yml | 5 ++++- tests/tests.sh | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37d2b92..696b258 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,7 +77,7 @@ test_some: artifacts: paths: - tests/errlist - - tests/*.xml + - tests/*.xml* when: always reports: junit: tests/*.xml @@ -90,6 +90,7 @@ nitunit_some: - git diff --name-only origin/master..HEAD -- "*.nit" "*.res" "README.*" | grep -v "^tests/" > list0.txt || true - xargs nitls -pP < list0.txt > list.txt - xargs nitunit < list.txt + - junit2html nitunit.xml artifacts: paths: - nitunit.xml* @@ -220,6 +221,7 @@ nitunit_lib: - xargs nitunit -v < list.txt| tee log.txt - grep -e KO log.txt > status.txt || true - tail -3 log.txt >> status.txt + - junit2html nitunit.xml artifacts: paths: - nitunit.xml* @@ -237,6 +239,7 @@ nitunit_src: - xargs nitunit -v < list.txt| tee log.txt - grep -e KO log.txt > status.txt || true - tail -3 log.txt >> status.txt + - junit2html nitunit.xml artifacts: paths: - nitunit.xml* diff --git a/tests/tests.sh b/tests/tests.sh index b771914..2aff98a 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -842,6 +842,10 @@ fi echo >>$xml "" +if type junit2html >/dev/null; then + junit2html "$xml" +fi + if [ -n "$nok" ]; then exit 1 else -- 1.7.9.5