From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Schwierzeck Date: Wed, 7 Dec 2016 17:46:14 +0100 Subject: [U-Boot] [PATCH] travis-ci: Switch to building QEMU In-Reply-To: <1481127640-16313-1-git-send-email-trini@konsulko.com> References: <1481127640-16313-1-git-send-email-trini@konsulko.com> Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Am 07.12.2016 um 17:20 schrieb Tom Rini: > 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 && you could speed up git clone: git clone --depth 1 --single-branch --branch v2.8.0-rc3 git://git.qemu.org/qemu.git /tmp/qemu pushd /tmp/qemu git submodule update --init --recommend-shallow --reference /tmp/dtc dtc Because we already cloned dtc in the install steps, we could use it as reference repository. BTW: you should consider adding "--single-branch --branch master" to the other clone tasks too. > + ./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" > -- - Daniel -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 473 bytes Desc: OpenPGP digital signature URL: