From 1e99bd1e7da5b4e337d5067255d24926267dcf6d Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 12:32:36 +0100 Subject: build: enable code coverage support --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 5091396..c5e6a8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ addons: sources: - sourceline: "ppa:ubuntu-toolchain-r/test" packages: ['g++-9'] + packages: lcov compiler: - gcc @@ -26,6 +27,6 @@ install: script: - mkdir -p build - cd build - - cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=ON .. + - cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES .. - cmake --build . --target all - ctest -- cgit v1.2.3 From e24b0c0affba86ce6953fc33e43e8382b92f4daf Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 12:36:24 +0100 Subject: ci: fix CI package configuration --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c5e6a8e..8ff810d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ addons: apt: sources: - sourceline: "ppa:ubuntu-toolchain-r/test" - packages: ['g++-9'] - packages: lcov + packages: + - g++-9 + - lcov compiler: - gcc -- cgit v1.2.3 From 4ccf8aabdef2be5d52a91b24dd2e026dce85cdeb Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 12:41:19 +0100 Subject: ci: upgrade cmake --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 8ff810d..eba74f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,11 @@ cache: install: - pip install conan - conan user + - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - + - sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' + - sudo apt-get update + - sudo apt-get install cmake script: - - mkdir -p build - - cd build - - cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES .. - - cmake --build . --target all - - ctest + - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES .. + - /usr/bin/cmake --build build --target all --parallel $(nproc) -- cgit v1.2.3 From eee66b517673da38e51b61dc7ed6a4dfdd2a83c9 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 13:00:39 +0100 Subject: build: fix coverage conditions --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index eba74f0..a348464 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,5 +30,5 @@ install: - sudo apt-get install cmake script: - - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES .. + - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES - /usr/bin/cmake --build build --target all --parallel $(nproc) -- cgit v1.2.3 From 22f3ea999fbe89fd199fad8227dd96f6b2982844 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 13:17:40 +0100 Subject: ci: install lcov from git --- .travis.yml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a348464..d148321 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,28 +6,34 @@ dist: bionic addons: apt: sources: - - sourceline: "ppa:ubuntu-toolchain-r/test" + - sourceline: 'ppa:ubuntu-toolchain-r/test' + - sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main' + key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc' packages: - g++-9 - - lcov + - cmake compiler: - gcc -env: - - CXX=g++-9 - cache: directories: - $HOME/.conan/data +before_install: + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 20 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 20 + - sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-9 20 + - sudo update-alternatives --config gcc + - sudo update-alternatives --config g++ + - sudo update-alternatives --config gcov + install: - pip install conan - conan user - - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | sudo apt-key add - - - sudo apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' - - sudo apt-get update - - sudo apt-get install cmake + - git clone git://github.com/linux-test-project/lcov.git + - cd lcov && sudo make install + - cd .. script: - /usr/bin/cmake -S . -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_TESTING=YES -DRUN_TESTS_AFTER_BUILD=YES -DENABLE_CODE_COVERAGE=YES -DPRINT_COVERAGE_REPORT=YES -- cgit v1.2.3 From cb4a299b43616dc94a0e6d09116a703a69755ce0 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sat, 29 Feb 2020 13:23:39 +0100 Subject: ci: add missing lcov dependencies --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index d148321..f523e70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ addons: packages: - g++-9 - cmake + - libperlio-gzip-perl + - libjson-perl compiler: - gcc -- cgit v1.2.3