From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Willian Rampazzo" <wrampazz@redhat.com>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>
Subject: [PATCH v2 1/5] travis.yml: Move gprof/gcov test across to gitlab
Date: Fri, 5 Feb 2021 10:18:53 +0100 [thread overview]
Message-ID: <20210205091857.845389-2-thuth@redhat.com> (raw)
In-Reply-To: <20210205091857.845389-1-thuth@redhat.com>
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Similarly to commit 8cdb2cef3f1, move the gprof/gcov test to GitLab.
The coverage-summary.sh script is not Travis-CI specific, make it
generic.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201108204535.2319870-10-philmd@redhat.com>
[thuth: Add gcovr and bsdmainutils which are required for the
coverage-summary.sh script to the ubuntu docker file,
and use 'check' as test target]
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.gitlab-ci.yml | 12 ++++++++++++
.travis.yml | 15 ---------------
MAINTAINERS | 2 +-
scripts/{travis => ci}/coverage-summary.sh | 2 +-
tests/docker/dockerfiles/ubuntu2004.docker | 2 ++
5 files changed, 16 insertions(+), 17 deletions(-)
rename scripts/{travis => ci}/coverage-summary.sh (92%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c0db64710..1070efce3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -468,6 +468,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 mips64-softmmu ppc64-softmmu
+ riscv64-softmmu s390x-softmmu x86_64-softmmu
+ 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 00626941f1..472e54f786 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3203,7 +3203,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
similarity index 92%
rename from scripts/travis/coverage-summary.sh
rename to 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 \
--
2.27.0
next prev parent reply other threads:[~2021-02-05 9:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-05 9:18 [PATCH v2 0/5] Move remaining x86 Travis jobs to the gitlab-CI Thomas Huth
2021-02-05 9:18 ` Thomas Huth [this message]
2021-02-05 13:37 ` [PATCH v2 1/5] travis.yml: Move gprof/gcov test across to gitlab Wainer dos Santos Moschetta
2021-02-05 16:58 ` Alex Bennée
2021-02-05 9:18 ` [PATCH v2 2/5] travis.yml: Move the -fsanitize=undefined test to the gitlab-CI Thomas Huth
2021-02-05 16:59 ` Alex Bennée
2021-02-05 9:18 ` [PATCH v2 3/5] travis.yml: Move the --enable-modules " Thomas Huth
2021-02-05 17:02 ` Alex Bennée
2021-02-05 9:18 ` [PATCH v2 4/5] travis.yml: (Re-)move the --enable-debug jobs Thomas Huth
2021-02-05 13:36 ` Wainer dos Santos Moschetta
2021-02-05 17:03 ` Alex Bennée
2021-02-05 9:18 ` [PATCH v2 5/5] travis.yml: Move the -fsanitize=thread testing to the gitlab-CI Thomas Huth
2021-02-05 17:47 ` Alex Bennée
2021-02-09 20:37 ` [PATCH v2 0/5] Move remaining x86 Travis jobs " Alex Bennée
2021-02-10 5:44 ` Thomas Huth
2021-02-10 7:17 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210205091857.845389-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=wainersm@redhat.com \
--cc=wrampazz@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.