From nobody Mon Feb 9 12:10:08 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612516942; cv=none; d=zohomail.com; s=zohoarc; b=ASCA8HxlHbz/CFva+mYTweoxF1ZG/W38xpaXmcXsfUBiJqoreJuSFaRfp1yGaR7Pc1zUmO/GnDL4oZf+1w2q5ZFGYDakOV6myhay09NEpL/rG+cOGVxueGZ31L9wn+uRNuBJ044ZCYRhdIUfq0ruywQrelFsAnJ6+Jq+Z+aHV14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612516942; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2tV/Dz5hr1kOvPpm8P8sKUKbYCIGeTWccUfWO4aOqHc=; b=Wh+yc3J4o8JEhIMK+e7qVbef4rwQcvfXylpZnppmEW6LUYa1M7ejQKdYYX/qfHunxpk+H2CZcjIxlb3j+q4QHWM4gU+50PtIyhx/Yv6CNvrKMoZR4W18PlDZRN4o32kVm3RaqdAOE+n8V8/bhCf7+xEFhYhCUSTigTKOEXS/+d4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612516942242561.6241067653839; Fri, 5 Feb 2021 01:22:22 -0800 (PST) Received: from localhost ([::1]:57580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7xJl-0004Fa-6w for importer@patchew.org; Fri, 05 Feb 2021 04:22:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7xGk-0002oV-6D for qemu-devel@nongnu.org; Fri, 05 Feb 2021 04:19:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34011) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7xGi-0007q4-Fm for qemu-devel@nongnu.org; Fri, 05 Feb 2021 04:19:13 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-54-2_6JEQ_WPWmH1t-zKLq6kw-1; Fri, 05 Feb 2021 04:19:09 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19B92CE647; Fri, 5 Feb 2021 09:19:08 +0000 (UTC) Received: from thuth.com (ovpn-112-46.ams2.redhat.com [10.36.112.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 42EC65D9CC; Fri, 5 Feb 2021 09:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612516751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2tV/Dz5hr1kOvPpm8P8sKUKbYCIGeTWccUfWO4aOqHc=; b=N5qGHOkmzPdj9JOX0q3r7/6tS1B+aO1nZq6hSTbN83XnohONqV/TaocOwHSwcBqu5bTodz X9VjbEN7DBMqBNQ8jAyhlvJL8/NMhOI6oFF3fYFDbBCQrycf5z8Y6Y0nj4EeaFCCsnKcOH LdG5O2qQvHWkn0oy7ILO5hOWYn68dOM= X-MC-Unique: 2_6JEQ_WPWmH1t-zKLq6kw-1 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 1/5] travis.yml: Move gprof/gcov test across to gitlab Date: Fri, 5 Feb 2021 10:18:53 +0100 Message-Id: <20210205091857.845389-2-thuth@redhat.com> In-Reply-To: <20210205091857.845389-1-thuth@redhat.com> References: <20210205091857.845389-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Willian Rampazzo , Wainer dos Santos Moschetta Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 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=C3=A9 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 Reviewed-by: Alex Benn=C3=A9e Reviewed-by: Wainer dos Santos Moschetta --- .gitlab-ci.yml | 12 ++++++++++++ .travis.yml | 15 --------------- MAINTAINERS | 2 +- scripts/{travis =3D> ci}/coverage-summary.sh | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 ++ 5 files changed, 16 insertions(+), 17 deletions(-) rename scripts/{travis =3D> 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 =20 +# 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 =20 @@ -166,20 +165,6 @@ jobs: compiler: clang =20 =20 - # gprof/gcov are GCC features - - name: "GCC gprof/gcov" - dist: bionic - addons: - apt: - packages: - - ninja-build - env: - - CONFIG=3D"--enable-gprof --enable-gcov --disable-libssh - --target-list=3D${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=C3=A9 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-summa= ry.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=C3=A9e # # 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/dock= erfiles/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 \ --=20 2.27.0