From patchwork Thu Feb 4 17:11:59 2016 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: 61216 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp585810lbl; Thu, 4 Feb 2016 09:16:55 -0800 (PST) X-Received: by 10.140.158.199 with SMTP id e190mr11107946qhe.74.1454606215368; Thu, 04 Feb 2016 09:16:55 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id p133si11452446qhp.53.2016.02.04.09.16.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 04 Feb 2016 09:16:55 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dkim=fail header.i=@linaro.org Received: from localhost ([::1]:43161 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRNWY-0002Vf-Qe for patch@linaro.org; Thu, 04 Feb 2016 12:16:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRNS7-0004fI-Ku for qemu-devel@nongnu.org; Thu, 04 Feb 2016 12:12:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRNS6-0003X8-Em for qemu-devel@nongnu.org; Thu, 04 Feb 2016 12:12:19 -0500 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:38791) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRNS6-0003W5-5Y for qemu-devel@nongnu.org; Thu, 04 Feb 2016 12:12:18 -0500 Received: by mail-wm0-x22f.google.com with SMTP id p63so127057021wmp.1 for ; Thu, 04 Feb 2016 09:12:18 -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-type:content-transfer-encoding; bh=yHS6paZZVot6Xofidmu/IhJdqqZuWjI1Z7WTdBeGVa4=; b=gg17YQYUHqXXerNBBvVjoEWjMVASungpXC6pu1H1meaKsqYP5GmVgbuAZIxfmDDkiS HKpYC6pn8W9J1ordnN74uF97RpFljVFDn6ThbvCWL2iJBsgYNqxVYfGffLSdgM6Ek0G8 /Es9p7gQKvIejCb4/HLLg59HfIatGYpYuDzt0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=yHS6paZZVot6Xofidmu/IhJdqqZuWjI1Z7WTdBeGVa4=; b=LPZu+irCvoVHJHlBaOat9lb0XW9ipo9iuW+f6kocNeqiBKdg5kRttZFV9q3y5JxCBM LWeLi2DIB5DLQ3KGUw1IiQK+CDtUilYY618aSclprlu3j3Wyr8AzUuWpPz7o5Sgo7yNC 2RdJaAZaNNfuKia3puBJvodZ4ZYppS2VX+HzraI/pXxr+N4MU5Z7ZB2S3Eqh5mmfxNs0 rCh8fKc/MDJAmqQhy59x+9lcM7iD5JhsO/4KSgFcEQ8Oon28T2oc0cCAJ5t3jOBd/KAS SXCLxvk9Py/O/t0FGexenrnglmO6xe1AyfPbjPc6krzt67dJWa9UHnSwnLkI5WGhGmKH gzKg== X-Gm-Message-State: AG10YORONn8IGOCoztsbkdPqT8Bu6mmEqN3Mam2pJQ89BlZvEVZjryDs3yBaD7+VVNa9A6Wp X-Received: by 10.194.205.5 with SMTP id lc5mr9429018wjc.163.1454605937636; Thu, 04 Feb 2016 09:12:17 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id ll9sm12168777wjc.29.2016.02.04.09.12.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2016 09:12:11 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1DF513E0790; Thu, 4 Feb 2016 17:12:09 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 4 Feb 2016 17:11:59 +0000 Message-Id: <1454605920-12791-6-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454605920-12791-1-git-send-email-alex.bennee@linaro.org> References: <1454605920-12791-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22f Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 5/6] .travis.yml: reduce the test matrix a little X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org As we are now running "make check" on more of the matrix it is worth making more of an effort to reduce the overall load on Travis. I've done a few things: - Combining a number of the targets - Building one target for each ancillary build Signed-off-by: Alex Bennée Reviewed-by: David Gibson Tested-by: David Gibson --- pr: added r-b and t-b tags --- .travis.yml | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) -- 2.7.0 diff --git a/.travis.yml b/.travis.yml index 4f09909..3b8046b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,20 +45,12 @@ env: - EXTRA_CONFIG="" matrix: # Group major targets together with their linux-user counterparts - - TARGETS=alpha-softmmu,alpha-linux-user + - TARGETS=alpha-softmmu,alpha-linux-user,cris-softmmu,cris-linux-user,m68k-softmmu,m68k-linux-user,microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user - TARGETS=arm-softmmu,arm-linux-user,armeb-linux-user,aarch64-softmmu,aarch64-linux-user - - TARGETS=cris-softmmu,cris-linux-user - TARGETS=i386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux-user - - TARGETS=m68k-softmmu,m68k-linux-user - - TARGETS=microblaze-softmmu,microblazeel-softmmu,microblaze-linux-user,microblazeel-linux-user - - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu - - TARGETS=mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user - - TARGETS=or32-softmmu,or32-linux-user - - TARGETS=ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user - - TARGETS=s390x-softmmu,s390x-linux-user - - TARGETS=sh4-softmmu,sh4eb-softmmu,sh4-linux-user sh4eb-linux-user - - TARGETS=sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user - - TARGETS=unicore32-softmmu,unicore32-linux-user + - TARGETS=mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,mipsn32-linux-user,mipsn32el-linux-user + - TARGETS=or32-softmmu,or32-linux-user,ppc-softmmu,ppc64-softmmu,ppcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le-linux-user + - TARGETS=s390x-softmmu,s390x-linux-user,sh4-softmmu,sh4eb-softmmu,sh4-linux-user,sh4eb-linux-user,sparc-softmmu,sparc64-softmmu,sparc-linux-user,sparc32plus-linux-user,sparc64-linux-user,unicore32-softmmu,unicore32-linux-user # Group remaining softmmu only targets into one build - TARGETS=lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,xtensaeb-softmmu git: @@ -75,56 +67,56 @@ matrix: # We manually include a number of additional build for non-standard bits include: # Debug related options - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-debug" compiler: gcc # We currently disable "make check" - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=alpha-softmmu EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter" TEST_CMD="" compiler: gcc # Disable a few of the optional features - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--disable-linux-aio --disable-cap-ng --disable-attr --disable-brlapi --disable-uuid --disable-libusb" compiler: gcc # Currently configure doesn't force --disable-pie - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-gprof --enable-gcov --disable-pie" compiler: gcc # Sparse - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-sparse" compiler: gcc # Modules - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=arm-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-modules" compiler: gcc # All the trace backends (apart from dtrace) - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=stderr" compiler: gcc - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=simple" compiler: gcc # We currently disable "make check" - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=ftrace" TEST_CMD="" compiler: gcc # We currently disable "make check" - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=ust" TEST_CMD="" compiler: gcc # All the co-routine backends (apart from windows) # We currently disable "make check" - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--with-coroutine=gthread" TEST_CMD="" compiler: gcc - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--with-coroutine=ucontext" compiler: gcc - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--with-coroutine=sigaltstack" compiler: gcc