From f51ceb142bfb612940f6bf51eac31364ac86acf2 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 12 Feb 2020 18:03:48 +0000 Subject: [PATCH] ci: Fix linking of the CI assets in the report The report is relative to the build directory, and so are the generated assets. --- .gitlab-ci/run-tests.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh index 9bac5b93c8..5638fa6593 100755 --- a/.gitlab-ci/run-tests.sh +++ b/.gitlab-ci/run-tests.sh @@ -17,16 +17,18 @@ xvfb-run -a -s "-screen 0 1024x768x24" \ # generate the reports exit_code=$? +cd ${builddir} + $srcdir/.gitlab-ci/meson-junit-report.py \ --project-name=gtk \ --job-id="${CI_JOB_NAME}" \ - --output=${builddir}/report.xml \ - ${builddir}/meson-logs/testlog.json + --output=report.xml \ + meson-logs/testlog.json $srcdir/.gitlab-ci/meson-html-report.py \ --project-name=gtk \ --job-id="${CI_JOB_NAME}" \ - --reftest-output-dir="${builddir}/testsuite/reftests/output" \ - --output=${builddir}/report.html \ - ${builddir}/meson-logs/testlog.json + --reftest-output-dir="testsuite/reftests/output" \ + --output=report.html \ + meson-logs/testlog.json exit $exit_code