From patchwork Wed Feb 17 12:19:27 2021 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: 383844 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2759293jao; Wed, 17 Feb 2021 04:22:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJzdM1vB0jaPWjUQ2jNyI167kpJK/zC/2+7lhs/mtYJI5o2nH8NStDjL5H1nE98YIRjPLtMr X-Received: by 2002:a25:abb2:: with SMTP id v47mr892280ybi.425.1613564533592; Wed, 17 Feb 2021 04:22:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564533; cv=none; d=google.com; s=arc-20160816; b=wqSJ6+pXmCKC+Xa+xgI+zqoAl952QQj8SXzDz+9gnEIua7BgBnnz61wen/TcWL12nN 8kzT+L1s0HVmLOalGB81TZZuRZY/LM2cQEBnr2qH3WKrjtDqUkGCmrL68wQSkgldopy8 nfYaFYHBpwvLTOdk0egqptnl645j6sULOF9EH+lPTEq6aDoYsrtTyZ8rOCJFL+0SoAIz iwGbnacF+Li16ibJsgQUVYSJcpyvfWTI8Qk+AXktvr+xK1jvFJk7ecKjuBb9MgX1FtXP huv8x6bIynt9QoyeN6cCoh5xo9haldlp9SSmtXoo9p7oN/D6BV3ZH2iCVlOdY83Xqf+H C5jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hTHuIZYF7Ch/fCQqi/0ES5poPKV3lkXwJDCUU0xASBM=; b=Vm/N4UxGg0Jl2P6mUoSH2Q98qf9ZMF53KccAJXIs5Ss1W5cfomFQ3NTqHDzfKoZzKn gUAtsLMX6Xxfcr9TFE88DlsiSXtwOYLncCehWBUyOSPg1fQLxOZBo6on39gfhjHkiiA9 TquWoaCCcqjmwQkmUvXDwNii6CwXnyZWQMAdCLgeFgF4K+zaCNgoCDm9Yt6xbRQiOUcx bPvQYHmDU/IqZH2az7NuWZJ1l0kI2aBdiUsmwsTNcVHYZkRU9lfzfOIcMvTwbWGoJzQM 6gOYy9TK8w5Ch5jGZNwAhwwp12iL7HQSOf5c1uR529i30jFpOUamKdvxiZBfBuCXxYB6 2FHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u3qqlEZu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 185si2037464ybv.119.2021.02.17.04.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:22:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=u3qqlEZu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:45576 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLqP-00061n-18 for patch@linaro.org; Wed, 17 Feb 2021 07:22:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54720) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLo6-0002TF-Dr for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:52 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42989) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLnt-0000It-Sf for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:49 -0500 Received: by mail-wr1-x42e.google.com with SMTP id r21so17135206wrr.9 for ; Wed, 17 Feb 2021 04:19:36 -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=hTHuIZYF7Ch/fCQqi/0ES5poPKV3lkXwJDCUU0xASBM=; b=u3qqlEZu5zYnOepoY09NOWwYpEGAOWPEP3LHveHD3Lb3zKGRlxI+sohw8J34zNTB3Y pa5mjZLEU4sltyJuzzt+DKI9AfSC19AyisDI499Y/E7uAm/tlkgajAlNlGndk4f0amlz frn7jjTU5y2cI6YA0KA0Yz6llRhW3nbqLahVyTmJDHX7qa8nD3kvUeytz/CKx2ISgjbT 6AZmDVtgAunjnkJsTISb9XK8EqL9bpHgHz0oscaRylkBsL1v9me7SaE7fwMUw5orWySU omNNB3N31MhxM3JLY60DiMHYvN9fzR0NJ8aEqF08Z9uQX8EcWgM2g7kok7/awGcI1vM0 NhAA== 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=hTHuIZYF7Ch/fCQqi/0ES5poPKV3lkXwJDCUU0xASBM=; b=tiJ6ihh2aztAAcd3rc42nB27VJhJNf8CXeZp79TLA6qMNQH+NPxN92T+2V2vtzbb+l 8H9EZ+4lqMqqDLkR/fyz8uT28u/1VETdZYRIKF5gOopoG3GvY7VSnf9H6z7yypVTMUu7 dD7swYDkliAlGU+k2aB7P0xKX4gE18DfvlwXyue1glUQjLJpZsSEk5yb1tEsT/bsJihK mN9gDz2ts0aN7Dc8n4GifALGpHefnFHpCHC1fKWT2RlNlvnOBo+HLAVxc0dvN/Wr3XZQ mJxS8RcHedxQyG0UnfvNdnRnpo2OK7FgYFkRg6Oa6BSqR3Mg+vBYiWQasOV5NK7erKEm xd9g== X-Gm-Message-State: AOAM530o1GPZNQxYzFowUaql9984mzdYQCWDAfqAUkM1TV6lzfAvUIuv NDS3YW4Zdb+uevWcxhX4Ar10U4r1eEE2KA== X-Received: by 2002:adf:9f54:: with SMTP id f20mr28909051wrg.362.1613564375158; Wed, 17 Feb 2021 04:19:35 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id 101sm4312687wrk.4.2021.02.17.04.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8F1F71FF87; Wed, 17 Feb 2021 12:19:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/6] meson.build: expose TCG cross compiler information in summary Date: Wed, 17 Feb 2021 12:19:27 +0000 Message-Id: <20210217121932.19986-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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, f4bug@amsat.org, stefanha@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Blink and you miss the cross TCG compiler stuff so lets display it with the rest of the compiler information. Signed-off-by: Alex Bennée Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Acked-by: Paolo Bonzini Message-Id: <20210216102522.6279-1-alex.bennee@linaro.org> --- meson.build | 18 ++++++++++++++++++ tests/tcg/configure.sh | 8 -------- 2 files changed, 18 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/meson.build b/meson.build index a923f249d8..4462e7279e 100644 --- a/meson.build +++ b/meson.build @@ -2508,6 +2508,24 @@ endif summary_info += {'strip binaries': get_option('strip')} summary_info += {'sparse': sparse.found() ? sparse.full_path() : false} summary_info += {'mingw32 support': targetos == 'windows'} + +# snarf the cross-compilation information for tests +foreach target: target_dirs + tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' + if fs.exists(tcg_mak) + config_cross_tcg = keyval.load(tcg_mak) + target = config_cross_tcg['TARGET_NAME'] + compiler = '' + if 'DOCKER_CROSS_CC_GUEST' in config_cross_tcg + summary_info += {target + ' tests': config_cross_tcg['DOCKER_CROSS_CC_GUEST'] + + ' via ' + config_cross_tcg['DOCKER_IMAGE']} + elif 'CROSS_CC_GUEST' in config_cross_tcg + summary_info += {target + ' tests' + : config_cross_tcg['CROSS_CC_GUEST'] } + endif + endif +endforeach + summary(summary_info, bool_yn: true, section: 'Compilation') # Targets and accelerators diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index e1b70e25f2..77a18fd289 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -257,11 +257,3 @@ for target in $target_list; do echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak fi done - -# report container support state -echo "cross containers $container" - -if test -n "$enabled_cross_compilers"; then - echo - echo "NOTE: guest cross-compilers enabled:$enabled_cross_compilers" -fi From patchwork Wed Feb 17 12:19:28 2021 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: 383846 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2759533jao; Wed, 17 Feb 2021 04:22:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJy+rp9u7XoYIY9CeWD1tY2KGKYINEU3mOajuKe57ypFnEyfKy1L3e+QUH9KoAGJBKNbQ+ga X-Received: by 2002:a25:2b08:: with SMTP id r8mr29123356ybr.194.1613564555800; Wed, 17 Feb 2021 04:22:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564555; cv=none; d=google.com; s=arc-20160816; b=o3NY9Hw2aK2VqulLP39imqPHjAg3kSVUfesuzYYjDt/UhjcG2/+nuZOTb6GOrP2slo h7OJQARXsrcBhDLxTabta7+BoX2CzXF2N+2iL5oODh8IhzwFECYROmuU4g09jzPmTC8a qebNeSRhFtISX9+m7iI0eo1Ec++WVY2Lu7hMsECLyojQBULf2jWGDJvaR77dXkrfY16k QgUcoGmKt8UsgK38py2EFrWogqJNASj2wbQAWLXFKT66zytGdlWpirFhWc6nBAZJw7kV 2agOjYHlJJJDWNwY1qKONXN/uowak6zGAevj1sph8peE7G9jjQIXS6iAigEPxP3UNU8m 1daA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Z7xvEMHCAPUwYe789c1mfBls6VgPCLJJofS5unRcGOk=; b=cpA+53knj/4eSwL0sRfCdD5zh4n01bKyPYzR0vj+8N2w8HzEOkItMTeE7DJ29/fzVA kFZ7frmOTBSjdfs91Ys8u+CwlzHHkxBsbYoO38fPgqD1tt6Gga3TfEtsELlANXDw3EtY XPrG7qy+AMjygLa+VbU9VbOrSqtnudXO1mdJ3tR1Es/hzqHahiLMwShm8y+GryIl1hNj yq++oRuwytcUBeUDGrOUAMtq9t3rxMeziWHbf3tjINZEz6OVjJSfx4YY3xbTRT0BBMZT 1dglMjn81LNQfhzvmIxyL4hnpMPRVRFtbuRJxh5vYNu/PG/SpKZ/Z4tmZ0nTdHoovZOT rYTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CW0uoIIY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j186si2449819ybg.39.2021.02.17.04.22.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:22:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CW0uoIIY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:45574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLql-00061l-AQ for patch@linaro.org; Wed, 17 Feb 2021 07:22:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLo6-0002TH-FO for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:52 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLny-0000Jy-NJ for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:50 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r21so17135415wrr.9 for ; Wed, 17 Feb 2021 04:19:39 -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=Z7xvEMHCAPUwYe789c1mfBls6VgPCLJJofS5unRcGOk=; b=CW0uoIIY1/EXmRPSDiWjrOU5/6WETRgGy6B2uJql5oW9rtGGZkiaUiP2ZA4/rjH7g/ +ek9zPMJeh3X16ljmMt60y+aS/UrxylAdkvWIELGX9RfCb17f32HBmla1/sPoXI3I1F8 ZLEOeR3BFUh7ontvlt5kawfPmo8NnDPe6Pfa6QrSgFoa/vSkEeakt7ZLmoiDd8A1qgWs 2ITf/Uw5n0L1QBUFvmytPLJEPinBpfx+/WBD40ipbe8AJX5EA/M9RD/rQfmTA6Med8ez V6I67C09Xx/PzgSvodzg5Cq07Uv8egDGK5jDDAROhAg3AiLxmYfLhjQjRwhrDa552133 OFBg== 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=Z7xvEMHCAPUwYe789c1mfBls6VgPCLJJofS5unRcGOk=; b=nfOQbxOYpbz14ghs3ZMrbgOeZhFXxE82sLzuxwwYQPRLSBJzzms32FP7vsu2RUuGSN s2gse/LQeb/Ej1rsXFc4PmvlOZORqDQ3GJQQNUbTkKBsA8+k3GAHX1tzIFkWcQluANOu ZbrSffLgSBiwX2dkhRbLV/dw9MTkEikxQOCZULWZsjMmLzjoRWM1Aektl8yMyO7nsUlC 7L1KjyaQnD6CndtOq/2yzHfOToR9xxTVMUDb40lcEZ7STfdHIdxFzxaCpKXWA6q3QcJE EaEAwvaqHED9Ksm7JqOkMg3tI/W0HO7EK9NV1op2gqr41O+d7qqZxnBylSrm/m8LfXwJ R8GQ== X-Gm-Message-State: AOAM531RTss5HcRSxInPxORcS9nYeAreTDxoMwcf5YAYRHrlEucNkbqZ PieeRMAq461ooV+oLPEm6hr60A== X-Received: by 2002:adf:f542:: with SMTP id j2mr21475801wrp.46.1613564378780; Wed, 17 Feb 2021 04:19:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o129sm2847535wme.21.2021.02.17.04.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A46071FF8C; Wed, 17 Feb 2021 12:19:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/6] gitlab-ci: Display Avocado log content when tests timeout Date: Wed, 17 Feb 2021 12:19:28 +0000 Message-Id: <20210217121932.19986-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Since commit ba2232bae6d ("gitlab-ci: Refactor code that show logs of failed acceptances") we display the log content of failing tests (Avocado "FAIL" event). Since we are also interested in tests timeouting, update our global Avocado config to display log content for the "INTERRUPT" event, "possible when the timeout is reached" (See [*]). [*] https://avocado-framework.readthedocs.io/en/latest/guides/writer/chapters/writing.html#test-statuses Suggested-by: Willian Rampazzo Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20210215171438.935665-1-philmd@redhat.com> --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 Acked-by: Thomas Huth diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7adb9a4cef..234cead60c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -64,7 +64,7 @@ include: - echo "[datadir.paths]" > ~/.config/avocado/avocado.conf - echo "cache_dirs = ['${CI_PROJECT_DIR}/avocado-cache']" >> ~/.config/avocado/avocado.conf - - echo -e '[job.output.testlogs]\nstatuses = ["FAIL"]' + - echo -e '[job.output.testlogs]\nstatuses = ["FAIL", "INTERRUPT"]' >> ~/.config/avocado/avocado.conf - if [ -d ${CI_PROJECT_DIR}/avocado-cache ]; then du -chs ${CI_PROJECT_DIR}/avocado-cache ; From patchwork Wed Feb 17 12:19:29 2021 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: 383842 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2757802jao; Wed, 17 Feb 2021 04:20:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwrxR8cABQ7QhDAmyZhqgtzYDntZYPHh4R4KXw6HoqTjVHh2++EzUgf36gNaS/eyioTUCAJ X-Received: by 2002:a25:d14d:: with SMTP id i74mr29276062ybg.38.1613564417360; Wed, 17 Feb 2021 04:20:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564417; cv=none; d=google.com; s=arc-20160816; b=vD1p9wuvkUaBng3xidHby1QHkIQ8R2FOhLNl/oPuzgiWQaBxqLlFGXYHtMgSEqXaY8 593le3wxwvm2YMpAW+DzP7y5k5C2AFlJT0vmW5dNlDq8Jq00JlAQSQCGKYnyOT0L0lS+ 29VRY85ao34gxzlMglEzgLzqWDsMKJVuy6ZeS+2jHHikdBd+PS7iQC0nRXdqGEzYTIu+ PXA+ajh6VaGrdhpoIUzjEIoL6JrjyP2zqVSODaR2LH42fC88WzwEPuKdyiKX/dtJgs25 UL0wIGlz5dg9kSTWu3+d5DCxEBDvwmnUv8iOr6FTAD+zgEB1l+fVYMSigFPtCOGqJMX9 0xtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qV5waBAMdWO3qnrnlPn9ZalPBhAFNnkmRpjSD/pQcHQ=; b=N2nvtntS4T0irH9MH/kQB7+VnXHiA8n6sontVixNzDgbxP9+kt5z6il3zexd3bAwrb ZxlSqAHMNiP/UFx6ls8APKUOSscPeT6ugWe72uZC7CDRIvpiYCMIJq6W+dIzGg8ZugSY KbozOw7SakuLjdv7JX2HUzgB5h8noGaDCfipY3gx650xsafKQiS6GGCL0LyznXv1ljHL fSSaI+i+IU5W2/zBLkTXLZELrRZ34YLGiebyfwdsjJ6u53WqYz9kz1LUhrcScFjmm2M6 zFvfDa5ZBu8Ky8Zb41Qa/YFqfI+0nPZkjapdHf7hEbqavEn3O1bc/9woFuq/prff5zfn X8bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jHu82T4j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z19si2154770ybi.280.2021.02.17.04.20.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:20:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jHu82T4j; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:38284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLoW-0002qA-Pe for patch@linaro.org; Wed, 17 Feb 2021 07:20:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLoI-0002nB-E1 for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:20:02 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:52515) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLoG-0000QX-N5 for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:20:02 -0500 Received: by mail-wm1-x32b.google.com with SMTP id l17so1965463wmq.2 for ; Wed, 17 Feb 2021 04:20:00 -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=qV5waBAMdWO3qnrnlPn9ZalPBhAFNnkmRpjSD/pQcHQ=; b=jHu82T4jI+IN7ZMMKtBmJUv7mJqpGkgyAfCthwMieDOyedwKate0CryRRjO8vF29Vx x6grVfSGH+IMo0rJsVAOSdkdBKGEgJCwu7z3ZCqV3HnpwIVjmr4IISUBwZNHEHK3SZTe mW4G5rd4UfxaQ+TwtRIGheZQfrDbmGQ9ggfiwWFYqYXS9GB5X6TZyrp5pvPQgwu5A5u0 57vYKLDGLbNQKPkllpqwWlRQ6HSfBUfAK7UjuDlx1yJOCwn2YaA5cM9T1HfA7hZuj0QH 7ystz/nKvTGiIuJ3DqTAcjr135tbtPk8T3ZkYCWZnfa58ZAfj/FH3dMTeq0Fr1jBpUFk Pkhg== 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=qV5waBAMdWO3qnrnlPn9ZalPBhAFNnkmRpjSD/pQcHQ=; b=sSe0T4sreuyeG1JTulqnIWWoPCljp+F14HhQWUF0e8aXlabEypu0KWdvmcxUuGAwY6 qqrK5nXyIaSV5ae0wK85TPaMZIRLUac8ucyPGdpTGOMTuX145Wg/c9nD03gX+EOTb//z kI9W9pmByb4/ul4Ds+lKyVa0CciqVZfVlg9poiawONxUucIcwZdrMDQNeLpfQUfuobEy 4UusAp6Q6CEUmgcBiRy+3AiTniaQtuCILSVqW8uv/1nXlebWohU6E8SlVV1lk57A4xGu RL2aemJaqCRMAARFQ+DdBo0BF/Bj19mYOuqN68wPrE3nroYqiD54YN6MZxe+Sx6AjUIQ G/2w== X-Gm-Message-State: AOAM530vtzc3fY1Vrh5+1vZE6hr67hsVEvrWr0Qr4mVO697F6rFWJgh2 PDyJQuxT1O0DCCa1hk86dMF2Cg== X-Received: by 2002:a1c:545d:: with SMTP id p29mr6831187wmi.54.1613564377972; Wed, 17 Feb 2021 04:19:37 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id k81sm2752534wmf.10.2021.02.17.04.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:33 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BAC1C1FF8F; Wed, 17 Feb 2021 12:19:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/6] gitlab-ci.yml: Run check-tcg with TCI Date: Wed, 17 Feb 2021 12:19:29 +0000 Message-Id: <20210217121932.19986-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, Thomas Huth , berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth It's now possible to also run the non-x86 TCG tests with TCI. Signed-off-by: Thomas Huth Signed-off-by: Alex Bennée Message-Id: <20210127055903.40148-1-thuth@redhat.com> --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 234cead60c..ec327d0a85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -520,7 +520,7 @@ build-oss-fuzz: build-tci: <<: *native_build_job_definition variables: - IMAGE: fedora + IMAGE: debian-all-test-cross script: - TARGETS="aarch64 alpha arm hppa m68k microblaze moxie ppc64 s390x x86_64" - mkdir build @@ -528,7 +528,6 @@ build-tci: - ../configure --enable-tcg-interpreter --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } - make -j"$JOBS" - - make run-tcg-tests-x86_64-softmmu - make tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test - for tg in $TARGETS ; do export QTEST_QEMU_BINARY="./qemu-system-${tg}" ; @@ -537,6 +536,7 @@ build-tci: done - QTEST_QEMU_BINARY="./qemu-system-x86_64" ./tests/qtest/pxe-test - QTEST_QEMU_BINARY="./qemu-system-s390x" ./tests/qtest/pxe-test -m slow + - make check-tcg # Alternate coroutines implementations are only really of interest to KVM users # However we can't test against KVM on Gitlab-CI so we can only run unit tests From patchwork Wed Feb 17 12:19:30 2021 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: 383843 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2758310jao; Wed, 17 Feb 2021 04:20:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxyxzRMBZFbPudFkpdwizxbh26UuXasjqEItlVdAco7/uZiaT+4uYGLEhaoEx+HZvDdIFiZ X-Received: by 2002:a25:1842:: with SMTP id 63mr35480226yby.238.1613564454262; Wed, 17 Feb 2021 04:20:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564454; cv=none; d=google.com; s=arc-20160816; b=xI7Mt2u27vAfFcLrKbdIcK2bJNY30VAEXqbC4RYGa2fr73TWki/RwrIyweBGq12kOe 3QmERTPf1lvEGkm/H0qEMRX2cgZKK5CYFuV0lyPJiy8A2LJr1dc1f3yW+b0GeRcjrnvv 2uv53OxdpSZcP1/c4XKmd8n+SkLSVsbkjwZeFJFcXcRPT7vzsvEscvNFj4rqyIY7iQAM vnfqv9IbRYE3Ij0aMXKxoRyoQqydrlD2w46SFFl765/IAsLfy0d3JdIug1fj5QzCDaUe yUQn/juWZ7xBpth3P+Z1P545TlSflCnxm/II9Ki6gjZim8RgP/WGnP6n0NgM1XSBPBTT QDaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vJeCzpPJmRXwnd8EbDANEp0YeTs+kON1Az++FO4VakE=; b=mpJJk5vJ30IQ3GomDI0zystypxo8hDf5uHZsFpZoBQk5xcbDdX0TwIYkiLg4SOmKLA aTGR3ElpYozYwMX3p54OjaUqEXbhj3/UXRM5/bD6jPMh72ZzcEdD1UJ6jMPKDbwNzJd9 QzrmL7rk2g+7Ih+JzRqtfq7BGhxc7fQnAQe7ay3vNfF9Pg5cWf/rMPMeZPyRb1kkFbC4 2OqlbYyhOmJiZf2+eUaiS2x+rpZ5DSEpqX+cZyn4CxhxU7S9/gH3Kz7oOQf1rbagDOeD ZLFYsxKSUFnt6D9/l55z94xtQnWayxX9g20B61oYyx7bTdbxVlyIjnE12nk+gI2vVzue sfwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dt6ypjBv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c15si2025840ybm.442.2021.02.17.04.20.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:20:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dt6ypjBv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:37536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLp7-0002Tc-OW for patch@linaro.org; Wed, 17 Feb 2021 07:20:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54694) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLo4-0002SY-Bo for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:48 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34288) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLny-0000KS-NZ for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:48 -0500 Received: by mail-wr1-x434.google.com with SMTP id n4so14205936wrx.1 for ; Wed, 17 Feb 2021 04:19:40 -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=vJeCzpPJmRXwnd8EbDANEp0YeTs+kON1Az++FO4VakE=; b=dt6ypjBvVHbbjRMEbQfDDB6eSgj6Vg+KVZJy/eR/UE84mvyjiiogDI4CsaeGs953+4 Rdma5pUhTIOE4Ci5KTFZjEJwtIDy84cwnHSP1fWdMMg/CHIpV4NUPydoeHUCKYvZYdaU b43eaO0TUfBpNP7gYVwEiVVEBl8e0GVmnPjStI70Sat7SUsVNHYHC0ZpAje0jkp6VCWr srfSi8B+k5mdUBI20oV+OBdzxZKbqiL/DIB3vgqXspNfhrCQpbCH3oXWGIA7ZYq7YtSd y+ZUhghntVhdnlKXV7Uywa/vJWEm1Hu+KlhdI+fFIXzJXmmUYpVqhhg0ute1Qy87QO2w yKHg== 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=vJeCzpPJmRXwnd8EbDANEp0YeTs+kON1Az++FO4VakE=; b=lIuAkwZqulfXsAi7rjHCYyz1luufXBVLSWxR81B10l+IveoIrZSBZThOY+lc+3iktw rtfLOD/mdTSM3w1hEcUizmLFXHxEOapCzBxLElWMx//u/qKa4nCiigDOs62raahzNQ4D mbIGhdg5+kUglZh3TTsCcee11lqok3KCIMEDI7hzalkuWS+h/cmHeTcPmEo09RB6oXvI icWgNmYe6WnR2UmuZ4BItREGYxQFAyXvZFW3AAOmlRxBx1wDMGQDavG13X8dvqiiHX6Z vQAywwdpqY0Gm68+LTaPnQ4TAMpnG7eX4pan99/LMDFYdN6lE/NPSmLv+lNzwi3dXvry DuwA== X-Gm-Message-State: AOAM532d5mipthrPoQ2euK1Npi7h1xsmOzYuYRkZsh4oroWZ9hyrkurG Bb+xelKbQcOuVtHuCbVC4jjKTQ== X-Received: by 2002:a5d:4850:: with SMTP id n16mr29398700wrs.296.1613564378064; Wed, 17 Feb 2021 04:19:38 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r12sm2638439wmg.44.2021.02.17.04.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D7C091FF90; Wed, 17 Feb 2021 12:19:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/6] docker: Bump Fedora images to release 33 Date: Wed, 17 Feb 2021 12:19:30 +0000 Message-Id: <20210217121932.19986-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, stefanha@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Fedora 33 was released on October 27, 2020. Update all the Fedora 32 images to this new release. Suggested-by: Daniel Berrangé Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20210118181255.314672-1-philmd@redhat.com> --- tests/docker/dockerfiles/fedora-cris-cross.docker | 2 +- tests/docker/dockerfiles/fedora-i386-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win32-cross.docker | 2 +- tests/docker/dockerfiles/fedora-win64-cross.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker index 09e7e449f9..1dfff6e0b9 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -2,7 +2,7 @@ # Cross compiler for cris system tests # -FROM fedora:30 +FROM fedora:33 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index a6e411291b..966072c08e 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:31 +FROM fedora:33 ENV PACKAGES \ bzip2 \ diffutils \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 087df598a0..81b5659e9c 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index d5d2f5f00d..bcb428e724 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 # Please keep this list sorted alphabetically ENV PACKAGES \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 0d7602abbe..915fdc1845 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,4 @@ -FROM fedora:32 +FROM fedora:33 # Please keep this list sorted alphabetically ENV PACKAGES \ From patchwork Wed Feb 17 12:19:31 2021 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: 383845 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2759328jao; Wed, 17 Feb 2021 04:22:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJyRTOBn+dY4UmpPASIeEvRWS9ahsto8B63DxrjgSBKbogFMWvMlRUNPHpOb2Ypg7J0Nz6ku X-Received: by 2002:a25:3bc3:: with SMTP id i186mr37047006yba.157.1613564536637; Wed, 17 Feb 2021 04:22:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564536; cv=none; d=google.com; s=arc-20160816; b=K7vtrcMRzS3R8AqFOr25CEhE2XG72oQjMYcGC1DIEH6A6/42rdv1mMDdZvvAYKbViu bMvTlTpsKbpo7d6aIXB7SHEQxB/w4k+Y2RrViUlbm4D6Q+7o0GM8YJ3UeWQnCr1NVHXG b8EroLHiioTBvprRf4HEE3Zmdpg2Wysq1n5fAw4ad13aR6YDNuqQC4+YyjDci06xjt7M WXRf6GeReg0evcxfIiApmVNh6eRJvc1Zik/0q4rxHe4r+4NLQm+jviKlAowtpYPCRFLe 4iupQEjLHdaffG5/VVdqMSOfOP9w/7wpfq+wMt9cAP1zyRwdC4e+YJ42bIu46t6ck+sl Mp0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xGOq+H9AOLX0RoZqFCkiJAoX0PwPDAbgocinnAmhldc=; b=OOz3ZgdQTVpEHabfJP5iuusqywaCzLVK2CSAoYTR2dtODHu2wu6URgN5rvv6RHq8jy 6McpCPMwWgBXuUi0U60rZTcAtAkWptap31M4QGqFF7SlwiJhyigq5QOjm4/r0B8PRa7X TMV0V5y5rqjQ8YqCpSYp5qIRJ+hR7P9VD8ZzkSSU0G4HCZ8OZpP7PNb5QgkMJnlJ+yox OA2ExYgpz2ugRDt/HkzRu/EYLz6wQhk1dM5pdW+OG5nzdaDJJXkKDlp0+fOVmCf19eIu P/SC2KUkjoOjWWZgd4ZBnEKy5eexQMvqlzk4cVqyYbPHKIb/R2EeIcZrz+pA+kzgu4gV 7VnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=njz5qyRX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n22si2253564ybg.348.2021.02.17.04.22.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:22:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=njz5qyRX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:45968 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLqS-0006BV-42 for patch@linaro.org; Wed, 17 Feb 2021 07:22:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLoC-0002ZB-A8 for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:56 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:41423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLo3-0000K9-8D for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:56 -0500 Received: by mail-wr1-x431.google.com with SMTP id n6so17150585wrv.8 for ; Wed, 17 Feb 2021 04:19:40 -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=xGOq+H9AOLX0RoZqFCkiJAoX0PwPDAbgocinnAmhldc=; b=njz5qyRX7LkDEW0M+nxbH8al3WSH+yC8vtt9bLhxD7QaJ8a8vdm6qwigAIZCDZLLfG qrPqkiKbjn+1uU3Jv376I0imSu6VUsjiXe4JXKJC4Mtq5VDpKToGskH+6SQXMVSaj+cP naErzwZASJwisZcG8bVNw8ou91t+wX5jPwgcXnHm+B/bMfnvOUsAWWCEQ2bHquXVERox KLKyvCRxHPhuckhJsL0mNUt8n3U8OvMtuGcTQ4hFOI95KYIjZ5YTmbSoo5Noyfc0Ol9w wRQjvz7UB9jnt8hytySoIMVB1Fe+JRnIoCCCPt6dTIINTQDPNoE3RjIs1Cj8gxOXuyCD +OsQ== 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=xGOq+H9AOLX0RoZqFCkiJAoX0PwPDAbgocinnAmhldc=; b=eWnLkEPm7vCJ71XxI+d/I76kyrcWDoqqSU1YaZ27RmgyLSCcy3RpdSF4srTFT1A4AA iBj6SDEUwLwUlHDM06kO1MUgoNzc09goLU3vX79SQxFX7qaydNqI26/0phuNgk5Tz5s3 bnBM5fT4e/0N9i2xfzJZhOi7it4t4pgJOpZVXy/nkDxXpe7o4eLUEUBBSJ3Yr56HBjo+ Kwn9JFKGySNrML60c02RtN5XtFQ2SpSrwVw6Hbpgt9Zt0j1vunfSCxbkdGqizp7yvJqt /E6vlrm23P2+cfVo8qlQoWTLiv8MLoyUmpZy9nPrwJtIaga9UFbTdXjPS2hQX/Xi5eGV Ywsg== X-Gm-Message-State: AOAM5335cCE6Zib10M4mrk8BNn8L8nDWVHJ2Yxbrakezi5ujeynfGy0G fvxpT+8sE9yTSYFbvsWj9iBBEw== X-Received: by 2002:adf:ea48:: with SMTP id j8mr28912206wrn.197.1613564379632; Wed, 17 Feb 2021 04:19:39 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f14sm2682216wmc.32.2021.02.17.04.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EC8511FF91; Wed, 17 Feb 2021 12:19:32 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/6] travis.yml: Limit simultaneous jobs to 3 Date: Wed, 17 Feb 2021 12:19:31 +0000 Message-Id: <20210217121932.19986-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, Thomas Huth , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , f4bug@amsat.org, stefanha@redhat.com, pbonzini@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth Even though the host machines that run the Travis CI jobs have quite a lot of CPUs (e.g. nproc in an aarch64 job reports 32), the containers on Travis are still limited to 2 vCPUs according to: https://docs.travis-ci.com/user/reference/overview/#approx-boot-time So we do not gain much when compiling with a job number based on the output of "getconf _NPROCESSORS_ONLN" - quite the contrary, the aarch64 containers are currently aborting quite often since they are running out of memory. Thus let's rather use a fixed number like 3 in the jobs here, so that e.g. two threads can actively run while a third one might be waiting for I/O operations to complete. This should hopefully fix the out-of-memory failures in the aarch64 CI jobs. Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210217102531.1441557-1-thuth@redhat.com> [AJB: add comment] Signed-off-by: Alex Bennée --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/.travis.yml b/.travis.yml index fc27fd6330..4609240b5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,9 +86,11 @@ git: submodules: false # Common first phase for all steps +# We no longer use nproc to calculate jobs: +# https://travis-ci.community/t/nproc-reports-32-cores-on-arm64/5851 before_install: - if command -v ccache ; then ccache --zero-stats ; fi - - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1)) + - export JOBS=3 - echo "=== Using ${JOBS} simultaneous jobs ===" # Configure step - may be overridden From patchwork Wed Feb 17 12:19:32 2021 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: 383841 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp2757716jao; Wed, 17 Feb 2021 04:20:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJyf/chWWlHY3ViTFRwQwINOHJhbvcEYmu8oWfyBxfia0yEP8n9kSuLBRtRpsM5tiU/DofCn X-Received: by 2002:a25:b883:: with SMTP id w3mr36857801ybj.321.1613564410343; Wed, 17 Feb 2021 04:20:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613564410; cv=none; d=google.com; s=arc-20160816; b=qYO6sFr5cQXEpOoodGl7PvFnoryvfv6MP8dH/TvS+sRV6h6Tb8y/vOvb8mmKk8flIB b50m5yg+NcSelWBuwn+kzHFJX5C/TyWaty/3L7bci9F2wIoNcUTOroksBFeNhPGiquKt zOUb0Cyj6FJvaDqr7m6SCgMzmM8cFe3twBjsqedvfWOTSddXt0Cmn20c35dGn4ou2dVz KH7GXJyf2EALfSA8/dujbaQwub09QqsrzDcwKuXLy1zLcRDEI87HVavw7lCcif1Foqzb IfnGs46peh69iH3HGzhTr0mnAQV2UMh9M5AI6Yd9lfcmGLwQHo7Vmj8ft3b/i3X1yu8Q 4a3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OqAjlZdVetE4v7d7JppPQVOHmx3wwh9lYwKIF6G6NII=; b=OR3PH7CVU3Gvk60nz3idTIZQ4doTZwocdxbdDmvGWtr97W+Pf6Z1YGGW+O9C/Vinaw N4dY9HSB8S4usuaOa/UeERLfT/CK7AoJFpoCKcRTbuPgiB8bOkfdayRqYrzpLZMZ3VWM +ktd8Eiv0btG/9mTHpFIzf3uMEj4jCzcEMHj0ID3aqOCyr54AlES1K1tSjwJ8vA52tRd HZIFLZ1eDLFCp1wvORJqIxjvJQymrxMPO6SZEBcEQPCgXB08JY6IQUvciTu18R3Jgfh2 2YSzCzbIeReBXMTYocSQmd3756gv1DWxQwS8gx+bVzNWtp8YBpGkDI2yOmtKCJ1fuZ55 mO5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="xuYtj/ea"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f126si2111012ybf.78.2021.02.17.04.20.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 04:20:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="xuYtj/ea"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:37766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCLoP-0002b7-DF for patch@linaro.org; Wed, 17 Feb 2021 07:20:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCLo8-0002U5-CT for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:52 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:55234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCLo3-0000Kq-8G for qemu-devel@nongnu.org; Wed, 17 Feb 2021 07:19:52 -0500 Received: by mail-wm1-x32a.google.com with SMTP id w4so1952870wmi.4 for ; Wed, 17 Feb 2021 04:19: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=OqAjlZdVetE4v7d7JppPQVOHmx3wwh9lYwKIF6G6NII=; b=xuYtj/eaHOGzDiEwbbkymqnnUu/sA/mPqyvrNsnVtdHTJyglPQuLJobgfA9/juOr5H ddYfL3Z1sI1q5MAoHioFudBokrfRSaW9sV6AyaiRJL6NmyLRFeOnkvx1dbS+ZlOgygm7 VCxANzgh6LJE0j+0l4JAmj6ufqYEVsPvQtJorNsC68AW9XVvWYph3u7eA313xpnZazYf IqZ2yMshMaLqn1SWBdnLSPxjoTr57zrlYBMFccBKmkaFWQCnlBGNbVOuVaKuXiJT0+JR o/0vsgj23luTpGXPbRjDiWsNQqXFkcS9dOTQymk5gwlg0WmdLy/mA1KOyR93H+xwbP2v MoxQ== 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=OqAjlZdVetE4v7d7JppPQVOHmx3wwh9lYwKIF6G6NII=; b=e81UgN/+jsSs6NyTTTBfuNo0Pdgb1VfAJ67DGW9ElsMXyOaP1DPwf4vJazzT4EnTW5 T1GreuVxZrYSbSUQZgOngSRhZaGAWGA/Tu/BsK49VgIaUwJ3YSRF7Z91h7CHYw57C7pC 0zGzn0exI96vnzPazdpZ7/HtDJZdXkCJxx+GHwXUIss4dOvmW3pzlulWD5TYUVODLHhM hpGHdihmdA8OHjsyrSbWO1j+slgwo2go73x4WOu2ikWs8psDIjMhQOyGTk2HkTouricR msx6+ls6pYyCPJmztXZvV2kJ6cfFS4RtbPiezgypyH6SOSCCub6rmeot0mkd81xpAD/+ 5JsQ== X-Gm-Message-State: AOAM530b5kp8yNWu7H7ViulYqPRBBW/CCQNseRR+IwXfKnMAONzp13Yv l7hP+0iuKDo9e7X6tHo82LbJ1A== X-Received: by 2002:a1c:7e4e:: with SMTP id z75mr7050260wmc.168.1613564380402; Wed, 17 Feb 2021 04:19:40 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w4sm2578107wmc.13.2021.02.17.04.19.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 04:19:37 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 101251FF92; Wed, 17 Feb 2021 12:19:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/6] tests/acceptance: allow a "graceful" failing for virtio-gpu test Date: Wed, 17 Feb 2021 12:19:32 +0000 Message-Id: <20210217121932.19986-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210217121932.19986-1-alex.bennee@linaro.org> References: <20210217121932.19986-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , Cleber Rosa , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, =?utf-8?q?Marc-?= =?utf-8?q?Andr=C3=A9_Lureau?= , pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is a band-aid with a TODO for cases when QEMU doesn't start due to missing VirGL. Longer term we could do with some proper feature probing. Signed-off-by: Alex Bennée Cc: Marc-André Lureau --- tests/acceptance/virtio-gpu.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Marc-André Lureau Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo diff --git a/tests/acceptance/virtio-gpu.py b/tests/acceptance/virtio-gpu.py index ab1a4c1a71..ab18cddbb7 100644 --- a/tests/acceptance/virtio-gpu.py +++ b/tests/acceptance/virtio-gpu.py @@ -85,7 +85,12 @@ def test_virtio_vga_virgl(self): "-append", kernel_command_line, ) - self.vm.launch() + try: + self.vm.launch() + except: + # TODO: probably fails because we are missing the VirGL features + self.cancel("VirGL not enabled?") + self.wait_for_console_pattern("as init process") exec_command_and_wait_for_pattern( self, "/usr/sbin/modprobe virtio_gpu", ""