diff options
| author | Matthias Dressel <code@deadcode.eu> | 2020-04-29 16:20:30 +0300 |
|---|---|---|
| committer | Jean-Baptiste Kempf <jb@videolan.org> | 2020-05-12 23:17:02 +0300 |
| commit | b6ee5e0117b701173daebca152da8e695a6a658b (patch) | |
| tree | f98dcc9168811dc8d0fed4a317b7329596822bf3 /.gitlab-ci.yml | |
| parent | ccab22246e0e2d970804b957e829f2126dcd0a9f (diff) | |
CI: Optimise multi-threading tests
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cab858b..5ca4291 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -351,16 +351,6 @@ build-debian-ppc64le: - git clone cache/dav1d-test-data.git tests/dav1d-test-data dependencies: [] -.test-debian-mt: - extends: - - .debian-amd64-common - - .test-common - needs: ["build-debian"] - dependencies: ["build-debian"] - script: - - meson configure build -Dtestdata_tests=true - - cd build && time meson test -v --suite testdata-8 --suite testdata-10 --suite testdata-12 --wrapper ../tests/dav1d-test-data/wrap_mt.sh - test-debian: extends: - .debian-amd64-common @@ -394,23 +384,20 @@ test-debian-asm: - time meson test -q --suite testdata-8 --suite testdata-10 --suite testdata-12 --test-args "--cpumask avx2" || exit_code=$((exit_code + $?)) - if [ $exit_code -ne 0 ]; then exit $exit_code; fi -test-debian-1tt-2ft: - extends: .test-debian-mt - variables: - TILETHREADS: 1 - FRAMETHREADS: 2 - -test-debian-2tt-1ft: - extends: .test-debian-mt - variables: - TILETHREADS: 2 - FRAMETHREADS: 1 - -test-debian-2tt-2ft: - extends: .test-debian-mt - variables: - TILETHREADS: 2 - FRAMETHREADS: 2 +test-debian-mt: + extends: + - .debian-amd64-common + - .test-common + needs: ["build-debian"] + dependencies: ["build-debian"] + script: + - meson configure build -Dtestdata_tests=true + - cd build + - exit_code=0 + - time meson test -q --suite testdata-8 --suite testdata-10 --suite testdata-12 --test-args "--tilethreads 1 --framethreads 2" || exit_code=$((exit_code + $?)) + - time meson test -q --suite testdata-8 --suite testdata-10 --suite testdata-12 --test-args "--tilethreads 2 --framethreads 1" || exit_code=$((exit_code + $?)) + - time meson test -q --suite testdata-8 --suite testdata-10 --suite testdata-12 --test-args "--tilethreads 2 --framethreads 2" || exit_code=$((exit_code + $?)) + - if [ $exit_code -ne 0 ]; then exit $exit_code; fi test-debian-unaligned-stack: extends: |