From ac81c81be10b1b08927eb1116ec47956c8f7ec44 Mon Sep 17 00:00:00 2001 From: kh2se2013 Date: Tue, 9 Jul 2019 15:18:53 +0800 Subject: [PATCH] unset CMAKE_BUILD_TYPE when WITH_COVERAGE = ON (#18541) install coverage package in develop image test = develop --- Dockerfile | 6 ++++++ cmake/coveralls.cmake | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5976915bc7..13642de1a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -125,6 +125,12 @@ RUN pip3.6 --no-cache-dir install pylint pytest astroid isort RUN pip3.7 --no-cache-dir install pylint pytest astroid isort RUN pip --no-cache-dir install pylint pytest astroid isort LinkChecker +# for coverage +RUN pip3 --no-cache-dir install coverage +RUN pip3.6 --no-cache-dir install coverage +RUN pip3.7 --no-cache-dir install coverage +RUN pip --no-cache-dir install coverage + COPY ./python/requirements.txt /root/ RUN pip3 --no-cache-dir install -r /root/requirements.txt RUN pip3.6 --no-cache-dir install -r /root/requirements.txt diff --git a/cmake/coveralls.cmake b/cmake/coveralls.cmake index ca1471cabb..c0e96e2877 100644 --- a/cmake/coveralls.cmake +++ b/cmake/coveralls.cmake @@ -62,7 +62,6 @@ function(code_coverage _COVERAGE_SRCS _COVERALLS_UPLOAD _CMAKE_SCRIPT_PATH) endfunction() if(WITH_COVERAGE) - set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -fprofile-arcs -ftest-coverage") -- GitLab