From patchwork Mon Feb 3 09:09:29 2020 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: 11362257 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0816B138D for ; Mon, 3 Feb 2020 09:15:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A1CD32070A for ; Mon, 3 Feb 2020 09:15:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Zj7MLoFq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1CD32070A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyXpG-0000Iv-IK for patchwork-qemu-devel@patchwork.kernel.org; Mon, 03 Feb 2020 04:15:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47812) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iyXjv-00078g-7j for qemu-devel@nongnu.org; Mon, 03 Feb 2020 04:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iyXju-0001Iw-3A for qemu-devel@nongnu.org; Mon, 03 Feb 2020 04:09:55 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44941) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iyXjt-0001IY-SR for qemu-devel@nongnu.org; Mon, 03 Feb 2020 04:09:54 -0500 Received: by mail-wr1-x442.google.com with SMTP id m16so16880423wrx.11 for ; Mon, 03 Feb 2020 01:09:53 -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=6SLyQx9usOP5EhubjT0CndDwEL+rYnuFBfAW77fKcPw=; b=Zj7MLoFqx+A7KSmxiSvQZ8RnGS+vgzBLEHv70ZpoxxjtWMVUfaAgZChu5B2X2H+Z6H tpVXcbwOMQ+CKCBUjwoxvw/1QAAci6c6/cI/zt0LNsorAFDhlTEdpLFtr+HW8khRke89 mkmoTlG6aGSKvmOP4Nce8NfjWabMY2AkQ1LDxz8V7dgdIcdyKqJ+vxn3Q25pu2yaPJ/S gHLhXeegteOK7pHbx7CJ1pTvvJbusUpoBQA6SVxz29bQueLk3ubVYUWyhYLYLsC4FJj+ 9rDWpCsnvl2XnNnXxFsDkQWfMEXaZ/SgQZxJl8rxZCosNqf6Bun4sCznx4mwfaSlg1XN Gq3g== 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=6SLyQx9usOP5EhubjT0CndDwEL+rYnuFBfAW77fKcPw=; b=GlEyYETF+jK/rGQEWxfgtHgM0F+MRY21B08sZscBfvw39Jf6nxWz2pvDG5TcW9f3by KAOQ4sIrZjftMMy+5xP+d8D89983zBqxdFz25Wt29JQd7Uz0XP3ahbAogp2j9eBZ1vv7 lypCFd9qms9B0sKXHSrwAC2dYtC4CuMrvYJqEmmzOps8esiC/gpA6pe57t3N40Kbe8lv XMPH02ltnryGruwQDvmCKL/7PdvmhvrMGtLgsrFSuQKzoz0Ph2Ih9vLzy4qbWL3+SY1o qpQxgjLnF3CM3/tyf7SnAlXCagpf8FQ6UoLwWiBREKxDPwz1pMWbZOYg7KtMVpyn6VN2 nkuw== X-Gm-Message-State: APjAAAWJ4TrpilEezpIlUlLqrS8SVTsMc5pDT1sp3vDe1auFotCBrn5Y wxF1gEI+NXlHbUrxWaG2uRA21A== X-Google-Smtp-Source: APXvYqwVqvlfc51v2g4rkHZHqsTw7mqwsaBb+eeznzJpCxqP9LBEumpZR7gwmDrZdyUuut5ejGboVg== X-Received: by 2002:a5d:5708:: with SMTP id a8mr13893855wrv.79.1580720992972; Mon, 03 Feb 2020 01:09:52 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v17sm24054500wrt.91.2020.02.03.01.09.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2020 01:09:48 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 95DFA1FF9E; Mon, 3 Feb 2020 09:09:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 14/17] .travis.yml: introduce TEST_BUILD_CMD and use it for check-tcg Date: Mon, 3 Feb 2020 09:09:29 +0000 Message-Id: <20200203090932.19147-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200203090932.19147-1-alex.bennee@linaro.org> References: <20200203090932.19147-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" At least for check-tcg we can split the build phase from the test phase and do the former in parallel. While we are at it drop the V=1 for the check-tcg part as it just generates a lot more noise in the logs. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- .travis.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index a600f508b0a..022462f6981 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,6 +71,7 @@ env: - SRC_DIR=".." - BUILD_DIR="build" - BASE_CONFIG="--disable-docs --disable-tools" + - TEST_BUILD_CMD="" - TEST_CMD="make check V=1" # This is broadly a list of "mainline" softmmu targets which have support across the major distros - MAIN_SOFTMMU_TARGETS="aarch64-softmmu,mips64-softmmu,ppc64-softmmu,riscv64-softmmu,s390x-softmmu,x86_64-softmmu" @@ -96,6 +97,12 @@ before_script: # Main build & test - rarely overridden - controlled by TEST_CMD script: - BUILD_RC=0 && make -j${JOBS} || BUILD_RC=$? + - | + if [ "$BUILD_RC" -eq 0 ] && [ -n "$TEST_BUILD_CMD" ]; then + ${TEST_BUILD_CMD} || BUILD_RC=$? + else + $(exit $BUILD_RC); + fi - if [ "$BUILD_RC" -eq 0 ] ; then travis_retry ${TEST_CMD} ; else $(exit $BUILD_RC); fi after_script: - if command -v ccache ; then ccache --show-stats ; fi @@ -368,7 +375,8 @@ matrix: - name: "GCC check-tcg (user)" env: - CONFIG="--disable-system --enable-debug-tcg" - - TEST_CMD="make -j${JOBS} check-tcg V=1" + - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" @@ -377,7 +385,8 @@ matrix: - name: "GCC plugins check-tcg (user)" env: - CONFIG="--disable-system --enable-plugins --enable-debug-tcg --target-list-exclude=sparc64-linux-user" - - TEST_CMD="make -j${JOBS} check-tcg V=1" + - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" @@ -385,7 +394,8 @@ matrix: - name: "GCC check-tcg (some-softmmu)" env: - CONFIG="--enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_CMD="make -j${JOBS} check-tcg V=1" + - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" @@ -393,7 +403,8 @@ matrix: - name: "GCC plugins check-tcg (some-softmmu)" env: - CONFIG="--enable-plugins --enable-debug-tcg --target-list=xtensa-softmmu,arm-softmmu,aarch64-softmmu,alpha-softmmu" - - TEST_CMD="make -j${JOBS} check-tcg V=1" + - TEST_BUILD_CMD="make -j${JOBS} build-tcg" + - TEST_CMD="make check-tcg" - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-debug-tcg" - name: "[aarch64] GCC check-tcg"