From patchwork Tue Feb 9 12:36:50 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: 580824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id A96591402B4 for ; Tue, 9 Feb 2016 23:37:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=kX234XXQ; dkim-atps=neutral Received: from localhost ([::1]:55296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7YD-0002BJ-OA for incoming@patchwork.ozlabs.org; Tue, 09 Feb 2016 07:37:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53671) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7XX-0000sS-N4 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT7XW-0001yZ-76 for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:07 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:34585) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT7XV-0001y2-TL for qemu-devel@nongnu.org; Tue, 09 Feb 2016 07:37:06 -0500 Received: by mail-wm0-x233.google.com with SMTP id 128so194731786wmz.1 for ; Tue, 09 Feb 2016 04:37:05 -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=mmeOnuL4nT+npHkM2S38+BdgZf84KQjQ74KmTVHJ7V8=; b=kX234XXQlN/zRa8Zfcrhf9BaoafBVaqk7K6zvghLyzslQlvvxSA9wqbB8mcNm6/Bga Ld/Tae9TC4p5U4cA8cbM8hLFnIEbdUpwwTqn9aZOhU5U730fSGNZfF69ijniyM4PzYnm HWRhEdTKgZcfZrMt5dqxdves9hp858tbxWP7g= 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=mmeOnuL4nT+npHkM2S38+BdgZf84KQjQ74KmTVHJ7V8=; b=imZ35d+bgfecMNl4YwS7SauAHp0ESQ0kRqh361YUkqaX9jEwIYSC1gmw8JrOXHYn/k GgK6bDZM316r4athcDoD+5SS4pypLpJ9bwvnpvTY0P7xeEwiJPW8tUMh6VWJGcuBknh3 y7Q+jgZnwKnibuXeWqRDdJHMUrlGHXVX+YUqZORnbW0J4jiNUkPQoQZV+t/at5AQ0Dg2 Tyt7vX6fUvxyFeaw/PogDuDg1TcvCpI5IQ0I2RWhQr+2a8QmbPtcp0t1nZup4lf4dDqP LogvCJQ73oUhvRfILnnb5KyepjzRU0aXqWhfkRGRUm6cRscAROXcyzauPCn4uk4pC0/t p7mg== X-Gm-Message-State: AG10YOSHS78S11/2PIams5MNiaMcjcYGZ3bsMgYa+X2x1TZaORtt1Fccp+tYtid/+T3XkbgS X-Received: by 10.195.13.129 with SMTP id ey1mr32807339wjd.132.1455021425323; Tue, 09 Feb 2016 04:37:05 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w62sm17344367wmg.21.2016.02.09.04.36.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Feb 2016 04:37:02 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1276A3E07AF; Tue, 9 Feb 2016 12:36:58 +0000 (GMT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 9 Feb 2016 12:36:50 +0000 Message-Id: <1455021411-11817-6-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455021411-11817-1-git-send-email-alex.bennee@linaro.org> References: <1455021411-11817-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::233 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.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 --- .travis.yml | 42 +++++++++++++++++------------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31d062f..9e5873b 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,58 +67,58 @@ 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=i386-softmmu EXTRA_CONFIG="--enable-trace-backends=log" compiler: gcc # We currently disable "make check" (until 41fc57e44ed regression fixed) - - env: TARGETS=i386-softmmu,x86_64-softmmu + - env: TARGETS=x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=simple" 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=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