From patchwork Fri Feb 10 15:04:52 2017 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: 93788 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp545837qgi; Fri, 10 Feb 2017 07:09:31 -0800 (PST) X-Received: by 10.55.175.195 with SMTP id y186mr8708389qke.26.1486739370956; Fri, 10 Feb 2017 07:09:30 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i5si1436498qkh.146.2017.02.10.07.09.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 Feb 2017 07:09:30 -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; dkim=fail header.i=@linaro.org; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44332 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccCpE-0001cu-Gd for patch@linaro.org; Fri, 10 Feb 2017 10:09:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52682) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ccCkd-000659-UP for qemu-devel@nongnu.org; Fri, 10 Feb 2017 10:04:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ccCkb-0002DK-Km for qemu-devel@nongnu.org; Fri, 10 Feb 2017 10:04:43 -0500 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:33558) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ccCkb-0002D6-Ei for qemu-devel@nongnu.org; Fri, 10 Feb 2017 10:04:41 -0500 Received: by mail-wm0-x229.google.com with SMTP id t18so65257538wmt.0 for ; Fri, 10 Feb 2017 07:04:41 -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=ASRZLDdeu790oyg8sJe3F0lvl1M4p0j6X9S80iiy2Ug=; b=EQe2TCc40gl+C8W3T4a0UDX0ADZQQc9QTXSBPbtno78CqGeeWDugYzadr70SMKUAXb qZtCirsf2ZFg1UkC6/nbfP8aslo8Mm2Mni1af2pcAJWdPRJu6DpjhA10ItVWKNjuVGnA vQqXqi+sgDBK3q0mk8gEpxtPZfiLLEGEsY46U= 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=ASRZLDdeu790oyg8sJe3F0lvl1M4p0j6X9S80iiy2Ug=; b=DisLNrDMvtL/SSeW4uOVmTn4xMDyRcFk1Lym4/g13XvqIXaTVy8duRD3Bve57H6TbZ WTBGB+pXwJhRpCWQugieSgROktAY3sWC+OjdfJ8us/fo7pgBMOowwn7z5gkLRH7VHzY/ bpPEsHQQBsxNAywQCbJXGUhPeTntS8KvOUFvg7MncHhJFS3kGP9W8yoVOjmumPOlmMjS 9M+CS98d7dnuscBfqUdpzltAsi4B6o2nmr41W13hs1oX94koJjHV5BwvNcC6dqDAtUml lfI2qsqflJhplawqkqS+Ncd7s3tNuZG+XWxobdYSN3PkrsnlrL5MJh/2i6KSk72zvKZ1 zJGw== X-Gm-Message-State: AMke39ly7Dlaalk03vV1a0zih7rqDCF37nrvWttc30b7Hq4+/Du6P/6oNoc1naj66cJQYDcd X-Received: by 10.28.66.88 with SMTP id p85mr27848238wma.64.1486739080313; Fri, 10 Feb 2017 07:04:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e71sm1979600wma.8.2017.02.10.07.04.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Feb 2017 07:04:39 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 821463E0A9A; Fri, 10 Feb 2017 15:04:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 10 Feb 2017 15:04:52 +0000 Message-Id: <20170210150452.21550-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170210150452.21550-1-alex.bennee@linaro.org> References: <20170210150452.21550-1-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::229 Subject: [Qemu-devel] [PULL 2/2] .travis.yml: split VM based builds 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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The Trusty based builds run a little slower than the main container based ones. This is also true for the latest version of Clang. The builds are getting very close (and occasionally run over) the 50 minute timeout. Rather than partitioning by target I just split them into linux-user and system builds. Signed-off-by: Alex Bennée --- .travis.yml | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/.travis.yml b/.travis.yml index 3dc1e6439d..9008a796f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,8 +92,19 @@ matrix: - env: CONFIG="" os: osx compiler: clang - # Plain Trusty Build - - env: CONFIG="" + # Plain Trusty System Build + - env: CONFIG="--disable-linux-user" + sudo: required + addons: + dist: trusty + compiler: gcc + before_install: + - sudo apt-get update -qq + - sudo apt-get build-dep -qq qemu + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ + - git submodule update --init --recursive + # Plain Trusty Linux User Build + - env: CONFIG="--disable-system" sudo: required addons: dist: trusty @@ -103,7 +114,26 @@ matrix: - sudo apt-get build-dep -qq qemu - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ - git submodule update --init --recursive - # Trusty build with latest stable clang + # Trusty System build with latest stable clang + - sudo: required + addons: + dist: trusty + language: generic + compiler: none + env: + - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 + - CONFIG="--disable-linux-user --cc=clang-3.9 --cxx=clang++-3.9" + before_install: + - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main' + - sudo apt-get update -qq + - sudo apt-get install -qq -y clang-3.9 + - sudo apt-get build-dep -qq qemu + - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-seed.tar.xz | tar -xvJ + - git submodule update --init --recursive + before_script: + - ./configure ${CONFIG} || cat config.log + # Trusty Linux User build with latest stable clang - sudo: required addons: dist: trusty @@ -111,7 +141,7 @@ matrix: compiler: none env: - COMPILER_NAME=clang CXX=clang++-3.9 CC=clang-3.9 - - CONFIG="--cc=clang-3.9 --cxx=clang++-3.9" + - CONFIG="--disable-system --cc=clang-3.9 --cxx=clang++-3.9" before_install: - wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - - sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.9 main'