From 8d1b572126afceb60693ff4c4a734bd6dbdaf548 Mon Sep 17 00:00:00 2001 From: Nikolai Kondrashov Date: Wed, 17 Jun 2015 15:13:41 +0300 Subject: CI: Enforce coverage make check failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fail CI coverage build, if make-check stage fails. Previously make-check stage failures were ignored for coverage build for the sake of collecting coverage data in any case. However, catching extra test failures seems more important than getting coverage data in all cases, thus the change. Reviewed-by: Lukáš Slebodník --- contrib/ci/run | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/ci/run b/contrib/ci/run index 090751d84..3fbf2c51f 100755 --- a/contrib/ci/run +++ b/contrib/ci/run @@ -259,6 +259,7 @@ function build_coverage() declare -r coverage_report_dir="ci-report-coverage" declare extra_CFLAGS="" declare test_dir + declare status if [[ "$DISTRO_BRANCH" == -redhat-redhatenterprise*-6.*- || "$DISTRO_BRANCH" == -redhat-centos-6.*- ]]; then @@ -284,8 +285,10 @@ function build_coverage() --base-directory "$BASE_DIR" \ --output-file ci-base.info # Run tests - stage make-check make -j $CPU_NUM check || true + status=$? + stage make-check make -j $CPU_NUM check || status=$? mv "$test_dir" ci-test-dir + ((status == 0)) stage lcov-post lcov --capture --directory . \ --base-directory "$BASE_DIR" \ -- cgit