diff options
| author | Federico Mena Quintero <federico@gnome.org> | 2023-03-10 11:47:20 -0600 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-03-14 23:51:53 +0000 |
| commit | 058d677e87a902e5fb725ffe558d635876826525 (patch) | |
| tree | 86840eaf2d92604d1fe8280276d8e3cb528fd6ff | |
| parent | 1fb51d361ed160e2a4339ecebd67a0b35fee3053 (diff) | |
| download | librsvg-058d677e87a902e5fb725ffe558d635876826525.tar.gz | |
CI: use TESTS_OUTPUT_DIR throughout for the tests
Some jobs were not picking up the test results correctly on failure,
but since the test suite usually passes, I didn't notice this.
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/812>
| -rw-r--r-- | .gitlab-ci.yml | 18 | ||||
| -rw-r--r-- | ci/test-msys2.sh | 1 |
2 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f05013a7..f60ad9b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ cargo_test: - tests/output expire_in: 1 day variables: - OUT_DIR: "${CI_PROJECT_DIR}/tests/output" + TESTS_OUTPUT_DIR: "${CI_PROJECT_DIR}/tests/output" script: - cargo test -- --skip loading_crash --skip reference --skip render_crash @@ -73,8 +73,6 @@ test_rust_gdk_pixbuf_loader: paths: - tests/output expire_in: 1 day - variables: - OUT_DIR: "${CI_PROJECT_DIR}/tests/output" script: - cd gdk-pixbuf-loader - cargo test @@ -90,11 +88,13 @@ test_rust_gdk_pixbuf_loader: - tests/output expire_in: 1 day variables: - OUT_DIR: "${CI_PROJECT_DIR}/tests/output" + TESTS_OUTPUT_DIR: "${CI_PROJECT_DIR}/tests/output" .build-rsvg-no-docs: extends: '.cache' stage: build + variables: + TESTS_OUTPUT_DIR: "${CI_PROJECT_DIR}/_build/tests/output" script: - mkdir -p _build - cd _build @@ -111,6 +111,8 @@ test_rust_gdk_pixbuf_loader: .build-rsvg-full: extends: '.cache' stage: build + variables: + TESTS_OUTPUT_DIR: "${CI_PROJECT_DIR}/_build/tests/output" script: - mkdir -p _build - cd _build @@ -123,6 +125,12 @@ test_rust_gdk_pixbuf_loader: - _build/doc/ - _build/tests/*.log expire_in: 1 day + artifacts: + when: 'on_failure' + paths: + - _build/tests/*.log + - _build/tests/output + expire_in: 1 day autotools build - opensuse@x86_64.stable: extends: @@ -406,7 +414,7 @@ msys2-mingw64: artifacts: when: 'on_failure' paths: - - _build/tests/output + - _build\tests\output expire_in: 1 day distcheck: diff --git a/ci/test-msys2.sh b/ci/test-msys2.sh index 75d07b95..6eae95c2 100644 --- a/ci/test-msys2.sh +++ b/ci/test-msys2.sh @@ -35,4 +35,5 @@ cd _build ../autogen.sh LIBS="-lws2_32 -luserenv" make export RUST_BACKTRACE=1 +export TESTS_OUTPUT_DIR=tests/output make check |