diff options
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rwxr-xr-x | scripts/ci/coverage-summary.sh (renamed from scripts/travis/coverage-summary.sh) | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu2004.docker | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28a83afb91..222858b553 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -467,6 +467,18 @@ check-deprecated: MAKE_CHECK_ARGS: check-tcg allow_failure: true +# gprof/gcov are GCC features +gprof-gcov: + <<: *native_build_job_definition + variables: + IMAGE: ubuntu2004 + CONFIGURE_ARGS: --enable-gprof --enable-gcov + MAKE_CHECK_ARGS: check + TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu + timeout: 70m + after_script: + - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh + build-oss-fuzz: <<: *native_build_job_definition variables: diff --git a/.travis.yml b/.travis.yml index 5f1dea873e..05fa1ca905 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,6 @@ addons: - ninja-build - sparse - uuid-dev - - gcovr # Tests dependencies - genisoimage @@ -166,20 +165,6 @@ jobs: compiler: clang - # gprof/gcov are GCC features - - name: "GCC gprof/gcov" - dist: bionic - addons: - apt: - packages: - - ninja-build - env: - - CONFIG="--enable-gprof --enable-gcov --disable-libssh - --target-list=${MAIN_SOFTMMU_TARGETS}" - after_success: - - ${SRC_DIR}/scripts/travis/coverage-summary.sh - - # Using newer GCC with sanitizers - name: "GCC9 with sanitizers (softmmu)" dist: bionic diff --git a/MAINTAINERS b/MAINTAINERS index de5fe1c65f..7f0781b7cc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3235,7 +3235,7 @@ R: Philippe Mathieu-Daudé <philmd@redhat.com> S: Maintained F: .github/lockdown.yml F: .travis.yml -F: scripts/travis/ +F: scripts/ci/ F: .shippable.yml F: tests/docker/ F: tests/vm/ diff --git a/scripts/travis/coverage-summary.sh b/scripts/ci/coverage-summary.sh index d7086cf9ca..8d9fb4de40 100755 --- a/scripts/travis/coverage-summary.sh +++ b/scripts/ci/coverage-summary.sh @@ -3,7 +3,7 @@ # Author: Alex Bennée <alex.bennee@linaro.org> # # Summerise the state of code coverage with gcovr and tweak the output -# to be more sane on Travis hosts. As we expect to be executed on a +# to be more sane on CI runner. As we expect to be executed on a # throw away CI instance we do spam temp files all over the shop. You # most likely don't want to execute this script but just call gcovr # directly. See also "make coverage-report" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 8519584d2b..9750016e51 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,8 +1,10 @@ FROM ubuntu:20.04 ENV PACKAGES flex bison \ + bsdmainutils \ ccache \ clang-10\ gcc \ + gcovr \ genisoimage \ gettext \ git \ |