summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte.benjamin@googlemail.com>2022-05-18 18:27:29 +0000
committerBenjamin Otte <otte.benjamin@googlemail.com>2022-05-18 18:27:29 +0000
commit1ea0de61e1a62771308de308f857cf0b5ed9e1ba (patch)
treeb6dd39e9209c74d8e7a18395a2051948fe523b98
parent04f924c13ea05330c5012167a7bcac68ac4374a9 (diff)
parente8eb96ae0cd9ba3673e6aaec6b9775c311aba076 (diff)
downloadgtk+-1ea0de61e1a62771308de308f857cf0b5ed9e1ba.tar.gz
Merge branch 'wip/otte/for-main' into 'main'
CI: Include reftest nodes in artifacts See merge request GNOME/gtk!4743
-rw-r--r--.gitlab-ci.yml1
-rwxr-xr-x.gitlab-ci/meson-html-report.py4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c560ee6b76..7dccd22275 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,6 +58,7 @@ style-check-diff:
- "${CI_PROJECT_DIR}/_build/report*.xml"
- "${CI_PROJECT_DIR}/_build/report*.html"
- "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
+ - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.node"
- "${CI_PROJECT_DIR}/_build/testsuite/tools/output/*/*"
- "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
- "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
diff --git a/.gitlab-ci/meson-html-report.py b/.gitlab-ci/meson-html-report.py
index dd1f5666d3..c7930a1b7a 100755
--- a/.gitlab-ci/meson-html-report.py
+++ b/.gitlab-ci/meson-html-report.py
@@ -185,6 +185,8 @@ ul.images li {
<li><img alt="ref" src="{{ failure.image_data.ref }}" /></li>
<li><img alt="out" src="{{ failure.image_data.out }}" /></li>
<li><img alt="diff" src="{{ failure.image_data.diff }}" /></li>
+ <li><a href="{{ failure.image_data.refnode }}">ref node</a></li>
+ <li><a href="{{ failure.image_data.outnode }}">out node</a></li>
</ul>
{% endif %}
</li>
@@ -311,6 +313,8 @@ for line in args.infile:
image_data = {
'ref': os.path.join(args.reftest_output_dir, '{}.ref.png'.format(basename)),
'out': os.path.join(args.reftest_output_dir, '{}.out.png'.format(basename)),
+ 'refnode': os.path.join(args.reftest_output_dir, '{}.ref.node'.format(basename)),
+ 'outnode': os.path.join(args.reftest_output_dir, '{}.out.node'.format(basename)),
'diff': os.path.join(args.reftest_output_dir, '{}.diff.png'.format(basename)),
}