From patchwork Thu Jan 10 17:45:06 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: 155258 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2176341jaa; Thu, 10 Jan 2019 09:52:13 -0800 (PST) X-Google-Smtp-Source: ALg8bN4NcYH3StBSIfeKeamge58CeCjHjX5WGOYZqG0wdO+UxsW2sqSnYvGPLpu4Hp7dPsB9PJrI X-Received: by 2002:a1c:c10f:: with SMTP id r15mr10718125wmf.27.1547142732978; Thu, 10 Jan 2019 09:52:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547142732; cv=none; d=google.com; s=arc-20160816; b=bwnE8pkNMugPycMZJiTUsqc5FbmBhFzlDlnYhcRoNyLVF7PlvgMpYIVK4j7TMSZDv5 hMAFrW8Mh/Xo0nDaILDor/Y1VC2my9fx8Z5mLc+SX95CQ5LgOS5tBoI4+MrmoADnvJlf 6gx3udVnC9c+EeP3jlPtx21CWtui4j1SqnFlahEp9NOJVeQffoZnOMMfKnClfq32UfTB tMRBPRuOlHlq+11XQgFWl1qLxz0vq1f+LHYeVnpBf0fQYwB6Zb/bxhFBXL3yDe81ggtV N/8y1iBFky3MxcuSi1pk5XqmODdnH1VcRSTvgVjqHLMLNPN1gvFcNJGezWsGD0MYNQPc NIRw== 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=M1z0Na9xOZvr67aRIJinTpIL3FSRsVRyIgb3D4pxlFI=; b=IHxEStj5X7iSgrk9I3YAO8iRgmUIolZvlr283Ffic1PjR6Cu1O03ltaxaIe++8wtIM goh+/CRz4T0Qi3BuyOCuqt9zZOq0iw0+RRD5p1KRUeopoTwiB2wYC1PRVt62WjFNLTKh jCBwnFmlZ1+uhQTZ+K0OG1cEN+dfu5wv57e5gGVVuKmHM1vK/YPBwCt2zO2UOnhtA40a NJEKLrWkB+2a6+wzF0iJaXPxZxWemABIY/eRVzyv9FJkC9J+5rdRG7SB4yJReajAvbnh vO2RtbqCBZW0slvZO2sjM8ndDes3kR8O5D3S4ju3aEum0qMgXu5rbDVWQQDzSz9rz6Zu AwDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KXMWYjqx; 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 y7si42876471wru.306.2019.01.10.09.52.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 10 Jan 2019 09:52:12 -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=KXMWYjqx; 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]:35231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gheV1-0001Vu-PI for patch@linaro.org; Thu, 10 Jan 2019 12:52:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gheOh-0004lt-Id for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gheOf-0008S8-T8 for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:39 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:38296) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gheOf-0007ky-Ld for qemu-devel@nongnu.org; Thu, 10 Jan 2019 12:45:37 -0500 Received: by mail-wm1-x32e.google.com with SMTP id m22so12976606wml.3 for ; Thu, 10 Jan 2019 09:45:27 -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=M1z0Na9xOZvr67aRIJinTpIL3FSRsVRyIgb3D4pxlFI=; b=KXMWYjqxdzv2IlheSre8P4K7WsH3XaehXO/mApr+GjGPkph8SWfB4iPzkzogduN2x/ oM1yfVe/vctAToZsf8iW3l1fw1WZQWhhNYoHsNmHNvSUei+FA3OVbnn7htW32yTtpU8k V+l0pZSXDEba0iyvAc6dNWjBnUTAucVpbEUeo= 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=M1z0Na9xOZvr67aRIJinTpIL3FSRsVRyIgb3D4pxlFI=; b=uHMYzSe8Q6K0+nxOXH6r0JSqbN7DxDztcmcStERNpzHk9BvlsWMfy6tJkKD9x5rmL7 HJiAAzqZA+8OCE2akpxsQJ03X8gOSDQXmV4zaEUhBhGwub1DZN8/6LWVQTcwEgi0dZsw sFvURRFizBYGBaRUrFscbQ1ArGvwcVh13hl0R/8bFvrzjHvyoWL6iM311ejUkr0BD5Vi m0vpixIMyx0FPknIioK9BwzpeaziDDoGQq8U49N9LeYe2P8uAqKUWs8Xf1FGZs/Witxy T3BKG4IFbVw/ZraA6DSjh7dh6OcqvnunkxlaDw5yCUEiQFrko4GdI1gJxR3rH0+RSFlW 0T8A== X-Gm-Message-State: AJcUukdnODCIKz8/35CBZ95FsgXwprhLTJ5bRRwF1KzZ1tcyrKeqKQcn M0Aiq0hYbR9FRe8HKMcyBGoHWQ== X-Received: by 2002:a1c:be11:: with SMTP id o17mr10468893wmf.111.1547142326352; Thu, 10 Jan 2019 09:45:26 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x3sm55269869wrd.19.2019.01.10.09.45.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Jan 2019 09:45:24 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AEDAD3E0E28; Thu, 10 Jan 2019 17:45:17 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 10 Jan 2019 17:45:06 +0000 Message-Id: <20190110174516.21586-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190110174516.21586-1-alex.bennee@linaro.org> References: <20190110174516.21586-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::32e Subject: [Qemu-devel] [PATCH v1 09/19] 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: ymankad@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Fam Zheng , =?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 --- .travis.yml | 77 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 28 deletions(-) -- 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: