diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2025-01-01 22:20:25 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2025-01-01 22:27:31 +0100 |
| commit | 12a3dfe6b86ca01ac2d643086b8f30e5b9189290 (patch) | |
| tree | cf4a8a5c60f90d338a01e3b61c8d229af5cd9fae /.gitlab-ci.yml | |
| parent | 32ff6f5f9de768536197ec803a7d0676512105e5 (diff) | |
test: Check "${METHODSDIR}/sqv" not "/usr/bin/sqv"
This is the correct check to find out whether we have built
with sqv support.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bf32b283..0147b37db 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,7 @@ variables: CCACHE_BASEDIR: $CI_PROJECT_DIR APT_CMAKE_BUILD_OPTIONS: '' DEB_BUILD_PROFILES: '' + BUILD_PRE: ':' cache: paths: - .ccache @@ -17,6 +18,7 @@ before_script: - chmod -R o+rwX $PWD - ./prepare-release travis-ci - sudo -u travis mkdir -p build .ccache + - $BUILD_PRE - sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ${APT_CMAKE_BUILD_OPTIONS} -G Ninja .. - sudo -u travis --preserve-env=CCACHE_DIR,CCACHE_BASEDIR ninja -C build @@ -34,8 +36,8 @@ test solver3 and gpgv: variables: APT_CMAKE_BUILD_OPTIONS: '-DWITH_DOC=OFF -DUSE_NLS=OFF' DEB_BUILD_PROFILES: 'nodoc' + BUILD_PRE: 'rm /usr/bin/sqv' script: - - rm -f /usr/bin/sqv - CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test - unbuffer ./test/integration/run-tests -q -j 4 --solver 3.0 --skip solver3.broken |