From a4ccb4972cf42e9376c961a5b2c24c28c27e2143 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Tue, 5 Jun 2018 13:58:48 -0400 Subject: [PATCH] ci: No need to "cd _build" and set prefix/libdir --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1362abc71..0632646a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,13 +17,11 @@ fedora-meson-x86_64: except: - tags variables: - CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" + CFLAGS: "-coverage -ftest-coverage -fprofile-arcs" script: - - meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build . - - cd _build - - ninja - - meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} - - cd .. + - meson --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build . + - ninja -C _build + - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} - mkdir -p _coverage - lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov" artifacts: