From patchwork Mon Jan 14 15:01:17 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: 155528 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3768781jaa; Mon, 14 Jan 2019 07:15:21 -0800 (PST) X-Google-Smtp-Source: ALg8bN67nAPXs9DxAl7bizQOBqQ6dKG42ycBczFvXonn7DbCj7zqnrZznKhe3jWcfVzR+OC9O0N8 X-Received: by 2002:adf:c5d3:: with SMTP id v19mr24493347wrg.30.1547478921404; Mon, 14 Jan 2019 07:15:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547478921; cv=none; d=google.com; s=arc-20160816; b=BYtoa/4ftZXUECotWaVWblqR7xFQ/kt6h1vxIbtMZ2c5VWYnrsIwhTZajIT18xi1vI Q1kcW49XJ38CFI2c4bGxGEpbA5pt557Bb3NgYiQHsIj9o9u7tgMSdncVzrhrb0lsLNKy 58EkGNYdy9zHDuyFNbuFeYasuXomEKHnLGEJeSJzgo5QtDb3/MU/aWFZGdSs+fUXNTAZ dL/KQoqwIlYhGhDPJJXFcGe7x1aEb13959yBHPNGARqKYabtrFrs3ZGguCKr446dl+9m wG94vkbVlHKCeUnJ/yOeHjAPWgMOv0HtdIM+O91cRgc4kdytHcplZlFV4/MF+o+VbRIk cLMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=raXxHAfIsAcqcOIkDe4iPDQinpBc2ZkVV/GqVccuyCs=; b=aElGm6wiKJZI1hCRWYeHSXTfr/Zt0d3mQpbL9Szu1QuuFEbFm1P+8BU17GR9Z2i/I4 bJB5LX5y1N75huZlRi9CftYmfkSqlrIyiZsCduWTFqrvVuARm902AXRrYa9mc4HehImr jLZtKjSTPIhoWyBN27G8eQiXYZQzNugbta1JG1X7jF24hJZWlgF3Cd/O7iSojfKcnnqO 3loUr6DSfPsRLz6rcFIyHnulhPKoMArna1x9w2WHiBQ/MCYzxePF6Xt4yEE0a9nbiElB RqTY8y4aO4+ku4R0FhxtW/6SYPSzPZCy3K7TxDR9vzqDGmO2xAl1W7AO2WrDxOeWsx85 jqQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UFLMOMWR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r10si46543578wrl.456.2019.01.14.07.15.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 14 Jan 2019 07:15:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UFLMOMWR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:50315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3xQ-0001Os-9S for patch@linaro.org; Mon, 14 Jan 2019 10:15:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj3kI-0006Mk-Hw for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj3kC-0005Lp-NB for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:46 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34457) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gj3kC-0005Ky-Dx for qemu-devel@nongnu.org; Mon, 14 Jan 2019 10:01:40 -0500 Received: by mail-wr1-x431.google.com with SMTP id j2so23309929wrw.1 for ; Mon, 14 Jan 2019 07:01:40 -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=raXxHAfIsAcqcOIkDe4iPDQinpBc2ZkVV/GqVccuyCs=; b=UFLMOMWRch7kvfv3NHbFLXxyJJCzD3QCUsglfkM75qbd6aRZpv4n+DC8a4eNw/Eo1F A+MVuXRYTKOgMqx8DTklPrsRT/Q7wkqCDILFdAohwW9DkUmTi3sq3t4nHMKfllLfswMw DjchGlOux/8HAcO4qiaLCUloUylVDNLw/F4EI= 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=raXxHAfIsAcqcOIkDe4iPDQinpBc2ZkVV/GqVccuyCs=; b=gbjlH2H/Wd53pRLhtc+B99jlOeX+lS5a5P3/WuXW+J9DfiFzfMLkZ74JoGBjS4V/sD a1h32z7UHDTXXr2r4qUy/s8uaUhXQIoK8mHaIfdD/yz+K0rCO2/Wz6CAHzYciqjiKeo1 xg7L0QhNTg0Q2yDFN2g4aBkZgFvoYLFSun0qKLH2yCtIlQ0Nn/S522BG2SUnZwySfq+R oilxjq3P8S9K4iYHUbquktCkJdt/cjbt4cWBMdDpCnDTPiRYl9CyW3B+C80WC8DZjEmZ mQD5mdbw0cQrtbOGDNybWvEEtNs/pLGu90K2xNRzICHc0K5G0ldBC9Gcryb2kSlTi6n/ z9ig== X-Gm-Message-State: AJcUukc9108WCCmrMK45w/Gb/I8vsjKhWqZTwJxiWX1P7Idr1/7MVg6o 4XcGFKwtL6IzmoZvaSUx4zidHA== X-Received: by 2002:adf:ee07:: with SMTP id y7mr25522823wrn.187.1547478099286; Mon, 14 Jan 2019 07:01:39 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c14sm25161069wme.13.2019.01.14.07.01.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 07:01:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 92FC33E1073; 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:17 +0000 Message-Id: <20190114150129.1013-10-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::431 Subject: [Qemu-devel] [PULL 09/21] travis: standardize the syntax used for env variables 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé Matrix entries are defining env variables using two different syntax styles: - env: FOO=bar WIZZ=bang and - env: - FOO=bar - WIZZ=bang Switch everything to use the latter style as the more normal indentation approach. Signed-off-by: Daniel P. Berrangé Signed-off-by: Alex Bennée -- 2.17.1 diff --git a/.travis.yml b/.travis.yml index 96917df9c5..f539f8b556 100644 --- a/.travis.yml +++ b/.travis.yml @@ -81,102 +81,123 @@ script: matrix: include: - - env: CONFIG="--disable-system" + - env: + - CONFIG="--disable-system" - - env: CONFIG="--disable-user" + - env: + - CONFIG="--disable-user" - - env: CONFIG="--enable-debug --enable-debug-tcg" + - env: + - CONFIG="--enable-debug --enable-debug-tcg" - - env: CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" + - env: + - CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb --disable-user" - - env: CONFIG="--enable-modules --disable-linux-user" + - env: + - CONFIG="--enable-modules --disable-linux-user" - - env: CONFIG="--with-coroutine=ucontext --disable-linux-user" + - env: + - CONFIG="--with-coroutine=ucontext --disable-linux-user" - - env: CONFIG="--with-coroutine=sigaltstack --disable-linux-user" + - env: + - CONFIG="--with-coroutine=sigaltstack --disable-linux-user" # Test out-of-tree builds - - env: CONFIG="--enable-debug --enable-debug-tcg" - BUILD_DIR="out-of-tree/build/dir" SRC_DIR="../../.." + - 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" + - env: + - CONFIG="--disable-system" compiler: clang - - env: CONFIG="--disable-user" + - 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" + - 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="" + - 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="" + - 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="" + - 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="" + - env: + - CONFIG="--enable-trace-backends=ust --target-list=x86_64-softmmu" + - TEST_CMD="" compiler: gcc - - env: CONFIG="--disable-tcg" - TEST_CMD="" + - 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" + - 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" + - 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" + - env: + - CONFIG="--target-list=x86_64-softmmu" python: - "3.0" - - env: CONFIG="--target-list=x86_64-softmmu" + - 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" + - env: + - CONFIG="--python=/usr/bin/python3 --target-list=x86_64-softmmu" + - TEST_CMD="make AVOCADO_SHOW=app check-acceptance" addons: apt: packages: