From patchwork Wed Dec 7 16:20:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 703650 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tYkKB4FTwz9sdn for ; Thu, 8 Dec 2016 03:21:49 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 04C9CA75B7; Wed, 7 Dec 2016 17:21:44 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aLHmct6DbMSJ; Wed, 7 Dec 2016 17:21:43 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 613DEA757A; Wed, 7 Dec 2016 17:21:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B1027A757A for ; Wed, 7 Dec 2016 17:21:12 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o4dXZjAkkej9 for ; Wed, 7 Dec 2016 17:21:04 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by theia.denx.de (Postfix) with ESMTPS id 4441CA7576 for ; Wed, 7 Dec 2016 17:20:43 +0100 (CET) Received: by mail-yw0-f193.google.com with SMTP id s68so32508608ywg.0 for ; Wed, 07 Dec 2016 08:20:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=nexC70rGoruzZ/YNitwRLRjVdM6/3Qo7Xwg0OEUggNo=; b=FBtkV0Ga1OR8KbnJfLVFWHHXYpc+k1Q0Bl+BTvLDaV0xe+gTetT+bF3bD5XsF1CQCq XU2TPsrirC9hAFrZF2RLwFiVsjW3x2yK8vVfYr2fhCAuSBwFNpnkOdGLo4jduiA9pMoH 9aNMRk/dzfkRS7M/dHggp2yM4r/dFbW+SPPU9wXVg/RftZZta77fwNj/+nHYcN4Oe6fG 5zfAQG8lp3YHR2vZfkxv9670Y5oQ5ujXYYC0jmEVSvZwwg/yg6JiQIeh8SYlZ/3FMCH5 j7kNg5NhEfFnqEO7vBVBXLIHea2JrvOtCGwgg3rwwdOckabvkKR+LEN4UVZRLP4OFaUK yQDQ== X-Gm-Message-State: AKaTC00MeERbpGN/Kcp7QIxQiBRjpvz5Phki+NCacFv7X7+Q0oZ/atIXmu1sT8gV6ritbw== X-Received: by 10.129.78.195 with SMTP id c186mr63136547ywb.7.1481127639472; Wed, 07 Dec 2016 08:20:39 -0800 (PST) Received: from localhost.localdomain (cpe-75-180-228-133.ec.res.rr.com. [75.180.228.133]) by smtp.gmail.com with ESMTPSA id r3sm10303364ywh.39.2016.12.07.08.20.38 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Dec 2016 08:20:38 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Date: Wed, 7 Dec 2016 11:20:40 -0500 Message-Id: <1481127640-16313-1-git-send-email-trini@konsulko.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] travis-ci: Switch to building QEMU X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" First, there are a number of features in newer QEMU that will allow us to test a wider range of platforms, so we want to use at least v2.8.0. Second, making use of a PPA for QEMU fails from time to time. So we change to checking out and building a copy of QEMU when we know that we are going to use test.py and need QEMU to be installed. This adds around 4 minutes per test.py job that we run. Signed-off-by: Tom Rini --- .travis.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 79bc24263abd..31fe27467184 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,6 @@ language: c addons: apt: - sources: - - sourceline: 'ppa:gns3/qemu' packages: - cppcheck - sloccount @@ -21,10 +19,6 @@ addons: - libsdl1.2-dev - python - python-virtualenv - - qemu-system-arm - - qemu-system-mips - - qemu-system-ppc - - qemu-system-x86 - gcc-powerpc-linux-gnu - gcc-arm-linux-gnueabihf - gcc-aarch64-linux-gnu @@ -54,7 +48,7 @@ install: env: global: - - PATH=/tmp/dtc:/tmp/uboot-test-hooks/bin:$PATH + - PATH=/tmp/dtc:/tmp/qemu-install/bin:/tmp/uboot-test-hooks/bin:$PATH - PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci - BUILD_DIR=build - HOSTCC="cc" @@ -74,6 +68,15 @@ before_script: echo -e "\n[toolchain-prefix]\nx86 = ${HOME}/.buildman-toolchains/gcc-4.9.0-nolibc/x86_64-linux/bin/x86_64-linux-" >> ~/.buildman; fi - if [[ "${TOOLCHAIN}" == *xtensa* ]]; then ./tools/buildman/buildman --fetch-arch xtensa ; fi + - if [[ "${QEMU_TARGET}" != "" ]]; then + git clone git://git.qemu.org/qemu.git /tmp/qemu; + pushd /tmp/qemu; + git submodule update --init dtc && + git checkout v2.8.0-rc3 && + ./configure --prefix=/tmp/qemu-install --target-list=${QEMU_TARGET} && + make -j4 all install; + popd; + fi script: # Comments must be outside the command strings below, or the Travis parser @@ -140,43 +143,52 @@ matrix: - env: - TEST_PY_BD="vexpress_ca15_tc2" TEST_PY_ID="--id qemu" + QEMU_TARGET="arm-softmmu" BUILDMAN="^vexpress_ca15_tc2$" - env: - TEST_PY_BD="vexpress_ca9x4" TEST_PY_ID="--id qemu" + QEMU_TARGET="arm-softmmu" BUILDMAN="^vexpress_ca9x4$" - env: - TEST_PY_BD="integratorcp_cm926ejs" TEST_PY_TEST_SPEC="not sleep" TEST_PY_ID="--id qemu" + QEMU_TARGET="arm-softmmu" BUILDMAN="^integratorcp_cm926ejs$" - env: - TEST_PY_BD="qemu_mips" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="mips-softmmu" BUILDMAN="^qemu_mips$" TOOLCHAIN="mips" - env: - TEST_PY_BD="qemu_mipsel" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="mipsel-softmmu" BUILDMAN="^qemu_mipsel$" TOOLCHAIN="mips" - env: - TEST_PY_BD="qemu_mips64" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="mips64-softmmu" BUILDMAN="^qemu_mips64$" TOOLCHAIN="mips" - env: - TEST_PY_BD="qemu_mips64el" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="mips64el-softmmu" BUILDMAN="^qemu_mips64el$" TOOLCHAIN="mips" - env: - TEST_PY_BD="qemu-ppce500" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="ppc-softmmu" BUILDMAN="^qemu-ppce500$" - env: - TEST_PY_BD="qemu-x86" TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="i386-softmmu" BUILDMAN="^qemu-x86$" TOOLCHAIN="x86_64" BUILD_ROM="yes"