Commit 4123aa23 authored by Sebastian Wolf's avatar Sebastian Wolf

Workaround for CI runner (and revert debug commits

parent 09e3bce5
Pipeline #1203 passed with stages
in 22 minutes and 57 seconds
......@@ -5,6 +5,7 @@ CXX = g++
COMPATIBILITY = -std=c++11
ACTIVATE_CODE_COVERAGE = TRUE # Enable coverage tests
BROCKEN_CI = TRUE # Enable workaround for brocken CI runner
DEBUG += -D _GLIBCXX_ASSERTIONS # Activate GLIBCXX assertions
DEBUG += -g # Adds debug symbols
......@@ -15,4 +16,4 @@ DEBUG += -g # Adds debug symbols
BLAS_LIBRARIES = -lopenblas -lgfortran # Openblas, serial
LAPACK_LIBRARIES = -llapacke -llapack # Standard Lapack + Lapacke libraries
SUITESPARSE = -lcholmod -lspqr
BOOST_LIBS = -lboost_filesystem
BOOST_LIBS = -lboost_filesystem -lboost_system
......@@ -34,7 +34,7 @@ job_test_gcc_nocheck:
job_code_coverage:
stage: code_coverage
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc config.mk; make test"
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc config.mk; mkdir -p build; make test &> build/build_output.txt || tail -n 500 build/build_output.txt; tail -n 500 build/build_output.txt"
when: always
job_build_python2:
......
......@@ -234,11 +234,20 @@ printBoostVersion: build/print_boost_version
@build/print_boost_version
ifdef ACTIVATE_CODE_COVERAGE
ifdef BROCKEN_CI
test:
mkdir -p build
$(MAKE) $(TEST_NAME) 2>&1 >/dev/null | grep "‘EnumMarker’ is deprecated" > build/required_tests.txt
make $(TEST_NAME)
@cat build/build_output.txt | grep "‘EnumMarker’ is deprecated" > build/required_tests.txt
./$(TEST_NAME) all
else
test:
mkdir -p build
make $(TEST_NAME) &> build/build_output.txt
@cat build/build_output.txt | grep "‘EnumMarker’ is deprecated" > build/required_tests.txt
./$(TEST_NAME) all
endif
else
test: $(TEST_NAME)
./$(TEST_NAME) all
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment