[CI] Fix parallel test execution and rename KVZ_TEST_VALGRIND to UVG_TEST_VALGRIND

This commit is contained in:
Marko Viitanen 2022-04-29 09:35:14 +03:00
parent 77d9545fd2
commit f694a63cc0
2 changed files with 5 additions and 5 deletions

View file

@ -8,8 +8,8 @@ test-kvazaar: &test-template
- bash .travis-install.bash - bash .travis-install.bash
- export PATH="${HOME}/bin:${PATH}" - export PATH="${HOME}/bin:${PATH}"
- cmake -DUSE_SHARED_LIB=OFF -DCMAKE_INSTALL_PREFIX=./ . || (cat config.log && false) - cmake -DUSE_SHARED_LIB=OFF -DCMAKE_INSTALL_PREFIX=./ . || (cat config.log && false)
- make install --jobs=8 - make install
- env CTEST_OUTPUT_ON_FAILURE=1 make test --jobs=8 - env CTEST_PARALLEL_LEVEL=8 CTEST_OUTPUT_ON_FAILURE=1 make test
artifacts: artifacts:
paths: paths:
- bin/uvg266 - bin/uvg266
@ -41,7 +41,7 @@ test-ubsan:
test-valgrind: test-valgrind:
<<: *test-template <<: *test-template
variables: variables:
KVZ_TEST_VALGRIND: 1 UVG_TEST_VALGRIND: 1
# TODO: If someone knows YAML better, there has to be some better way to # TODO: If someone knows YAML better, there has to be some better way to
# concatenate stuff into the test-template script than just manually copy # concatenate stuff into the test-template script than just manually copy

View file

@ -36,9 +36,9 @@ valgrind_test() {
prepare "${dimensions}" "${frames}" "${format}" prepare "${dimensions}" "${frames}" "${format}"
# If $KVZ_TEST_VALGRIND is defined and equal to "1", run the test with # If $UVG_TEST_VALGRIND is defined and equal to "1", run the test with
# valgrind. Otherwise, run without valgrind. # valgrind. Otherwise, run without valgrind.
if [ "${KVZ_TEST_VALGRIND:-0}" = '1' ]; then if [ "${UVG_TEST_VALGRIND:-0}" = '1' ]; then
valgrind='valgrind --leak-check=full --error-exitcode=1 --' valgrind='valgrind --leak-check=full --error-exitcode=1 --'
else else
valgrind='' valgrind=''