From patchwork Mon Jan 14 15:01:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10762933 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC5B51580 for ; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A95052927B for ; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A724C29317; Mon, 14 Jan 2019 15:20:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 04A0F2927B for ; Mon, 14 Jan 2019 15:20:30 +0000 (UTC) Received: from localhost ([127.0.0.1]:51884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj42P-0006JE-B5 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 14 Jan 2019 10:20:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kE-0006Io-LT for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3k9-0005Ji-J1 for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:42 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:38367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3k9-0005HC-9I for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:37 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v13so23223089wrw.5 for ; Mon, 14 Jan 2019 07:01:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LRZCNdGylobkVLyyK37xleoMBFQe15hUyJ+EPDuYZhs=; b=NpLiAlJsSqS4S1n1WPefY6yWo5iccdzB1glK5f78vISk7cHLoJ2+7KIiaTmQ+5VCft 7uH/kQzoyb0npH2H0JCSBF/bIe2VlDPLS34b+rtzdGoHIOfoSG+u0WhKuT1sqgmBz762 ZUyAhcU83bkEpde3HBrZm8RqdytEvh4M7dER8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LRZCNdGylobkVLyyK37xleoMBFQe15hUyJ+EPDuYZhs=; b=HauBR8wi40jikN2oq7tPsF/0D04faScwSbH2mTI0Ls91XkiACe4pL3QjpFDJLI1wzg b7ije/rbBcJsR7XIFBw+BSPczJL/QisfcR1SySUk4fKSn8D4rOlI1QXXjC40ivBCHaAX f45pg96aDMuwRO9mjJv4EmzFODshhXqqaGcVfVxN3xsSDpAZ9sR72cAt4fZOyG7Du4UA /7Lmyl1d6Vh85qV05TWAR4UkwxFAPfrOWF+UdLCOqOXniVVJoxTGDPv5ke/Ceud5Lvnf RL+7kS8pwMoGm+3MwrLcsaC71x7nR2iZNzzJOR9sR+6jn1vw8WqKz/R4P9bZeYSv9x8K T5Yw== X-Gm-Message-State: AJcUukfPTXds2edut5mjVFcV7sNe3+grEyvqbMzg9NDY6L79pYZAUxn/ Q2rO/C9KLIw+saD7lTY6g4YS5g== X-Google-Smtp-Source: ALg8bN5xdwwJ0aV+pP6aqgntSI27KZ+DqjPP17Qeyx/nEQNkABJBIRUMmHstUbBoooJKQ8Z84iJ2YQ== X-Received: by 2002:a5d:60cc:: with SMTP id x12mr23875814wrt.193.1547478095887; Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f15sm74455424wrt.10.2019.01.14.07.01.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:35 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 68AFF3E1011; Mon, 14 Jan 2019 15:01:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 14 Jan 2019 15:01:15 +0000 Message-Id: <20190114150129.1013-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190114150129.1013-1-alex.bennee@linaro.org> References: <20190114150129.1013-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PULL 07/21] travis: add whitespace between each major section & matrix entry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Daniel P. Berrangé Improve the readability of the travis config by adding two blank lines between each major section and matrix entry. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée diff --git a/.travis.yml b/.travis.yml index d472fd650b..bb43792627 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ # The current Travis default is a container based 14.04 Trust on EC2 # Additional builds with specific requirements for a full VM need to # be added as additional matrix: entries later on + sudo: false dist: trusty language: c @@ -9,6 +10,8 @@ python: compiler: - gcc cache: ccache + + addons: apt: packages: @@ -40,6 +43,7 @@ addons: - uuid-dev - gcovr + # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu # to prevent IRC notifications from forks. This was created using: # $ travis encrypt -r "qemu/qemu" "irc.oftc.net#qemu" @@ -49,6 +53,8 @@ notifications: - secure: "F7GDRgjuOo5IUyRLqSkmDL7kvdU4UcH3Lm/W2db2JnDHTGCqgEdaYEYKciyCLZ57vOTsTsOgesN8iUT7hNHBd1KWKjZe9KDTZWppWRYVwAwQMzVeSOsbbU4tRoJ6Pp+3qhH1Z0eGYR9ZgKYAoTumDFgSAYRp4IscKS8jkoedOqM=" on_success: change on_failure: always + + env: global: - SRC_DIR="." @@ -63,9 +69,13 @@ env: - CONFIG="--enable-modules --disable-linux-user" - CONFIG="--with-coroutine=ucontext --disable-linux-user" - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + + git: # we want to do this ourselves submodules: false + + before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update ; fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install libffi gettext glib pixman ; fi @@ -75,54 +85,82 @@ before_script: - ${SRC_DIR}/configure ${CONFIG} || { cat config.log && exit 1; } script: - make ${MAKEFLAGS} && ${TEST_CMD} + + matrix: include: # Test out-of-tree builds - env: CONFIG="--enable-debug --enable-debug-tcg" BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." + + # Test with Clang for compile portability (Travis uses clang-5.0) - env: CONFIG="--disable-system" compiler: clang + + - env: CONFIG="--disable-user" compiler: clang + + # gprof/gcov are GCC features - env: CONFIG="--enable-gprof --enable-gcov --disable-pie --target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" after_success: - ${SRC_DIR}/scripts/travis/coverage-summary.sh compiler: gcc + + # We manually include builds which we disable "make check" for - env: CONFIG="--enable-debug --enable-tcg-interpreter" TEST_CMD="" compiler: gcc + + # We don't need to exercise every backend with every front-end - env: CONFIG="--enable-trace-backends=log,simple,syslog --disable-system" TEST_CMD="" compiler: gcc + + - env: CONFIG="--enable-trace-backends=ftrace --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc + + - env: CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" TEST_CMD="" compiler: gcc + + - env: CONFIG="--disable-tcg" TEST_CMD="" compiler: gcc + + # MacOSX builds - env: CONFIG="--target-list=aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" os: osx osx_image: xcode9.4 compiler: clang + + - env: CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu" os: osx osx_image: xcode10 compiler: clang + + # Python builds - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.0" + + - env: CONFIG="--target-list=x86_64-softmmu" python: - "3.6" + + # Acceptance (Functional) tests - env: CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu" TEST_CMD="make AVOCADO_SHOW=app check-acceptance" @@ -131,6 +169,8 @@ matrix: packages: - python3-pip - python3.4-venv + + # Using newer GCC with sanitizers - addons: apt: @@ -175,6 +215,8 @@ matrix: - TEST_CMD="" before_script: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; } + + - env: - CONFIG="--disable-system --disable-docs" - TEST_CMD="make check-tcg"