From patchwork Wed Dec 21 14:40:14 2022 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: 635633 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3548532pvb; Wed, 21 Dec 2022 06:41:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXuZzc41Kl6DOEjN/16ahZOqhcRbAY6b0AZULMTlH38Z4M4hCi/edrnc2vGMECeTW0Q7JgsP X-Received: by 2002:ac8:749a:0:b0:3a8:2a89:d57d with SMTP id v26-20020ac8749a000000b003a82a89d57dmr2279143qtq.67.1671633679136; Wed, 21 Dec 2022 06:41:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633679; cv=none; d=google.com; s=arc-20160816; b=VVWacdhgk2/R0r4YHksWf9UcCiXBjTQBYuj/SwgJwLOgjXDy6S1OYiXhy/8yCzla/p Wnjo133c60LiR5OCidqG7I91bhJH77Vg0vPqERCAz0Xu1jgGyl2r3SLjliOLmWJJec+7 MAv3/9+FNkHT8O9BqYClIrmrSQhZHPYt25240WSkoG8RQcTmdWgj1UCAPQRqrQrORTtS FQ8pw8KhcoAa8IV8if7n1tf+PD+C86QjSDJXp/ZzQkORIbP4to/5E0uYkOg5tkARkgIj OD7iltJY1G+J9+Fn4fdYSaPET7L5IoymGODxN4F2XHF9xcTGfux9gkVgi/7LpWkem0l0 vskA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=87B4xJDM8OIXYXegfKHvBAcAzKRV4DRuOlrFU4smc8k=; b=jOb+DMeBx1LE7gBitKHIHmsJyvYybnpbghZxduxgdH2BHSWVsD0eCtWLF/UcFT6S9z 6pE0mrVYBHV4aHRK7pchSVqztanjtyjtfBS+c0os24BmWqNBMIc9Fwjl8TuyXRzF6S3o H7Z8+IXjN0qeagNIXKzFmZlhGCP+spsr0BVRZU82F5BhtbmAXHhi4uvGr0Zp/nyD1xFk kg/Wci/ty6GR14qHlrdL2KVBP1LNIHGZW703IHgPquFOXDb3xzHrl+vBMuz9PyIGn1yV H0XmP2ouO3ojQXLp+HfNfbQrzpG1T5QnoAO6TGBxNbQqv2rT7gEwKNlHpLZZpBJ0TpvR Z1xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KVJJbDMU; 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=pass (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 fb12-20020a05622a480c00b003a988a6fb21si3452686qtb.620.2022.12.21.06.41.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:41:19 -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=pass header.i=@linaro.org header.s=google header.b=KVJJbDMU; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Gg-0006vL-Nn; Wed, 21 Dec 2022 09:40:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Ge-0006ty-Pb for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:24 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Gc-0004tF-Mf for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:24 -0500 Received: by mail-wm1-x32f.google.com with SMTP id r126-20020a1c4484000000b003d6b8e8e07fso1514209wma.0 for ; Wed, 21 Dec 2022 06:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=87B4xJDM8OIXYXegfKHvBAcAzKRV4DRuOlrFU4smc8k=; b=KVJJbDMUk974i5fqeyEKzAZsPR3EuJkfWeJirG45Vx11ut83jWjVbRfJDInvgXGjM3 DnFEZf0WU58WhpVItKFLjcutpbk2WxqUI6c/YERfSg82dJvM4pfYabxM6Gv63MsVLVdI kHxcV1BiOqvsZpM/fKjI8264GXXP5/lYxWRqnWKr7r8gk6uzcm2rEJ8HZLA8rBlqEeSu bdZ5oXauKutzthV+daifBTcoKlVmn5xnLe5+2yZRcySo8MUQTSeqf7h/gn4ajKR0eJnQ waQlasqlpLUX6KfhsaBR3sMdhCLFj+N8qZ9tYuvGRvMaqyOpyvbdeEt5/Zz/FhY8aKcJ zCgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=87B4xJDM8OIXYXegfKHvBAcAzKRV4DRuOlrFU4smc8k=; b=njqe/UZ10+K8OQnrmVXM/vNmUGD6oqIKaI4X78xf0nqDrAjlwFWphomLoqav1bJ5xr dVM/xMyL9QUcPw0r0EKuFSfLmMuSzGZZVeIkeaIObO+6MqDWcYXPhpvnzhP8E6QTpb4j w932WyNYuEgGmPX9yuPx67KSNEYpiG5aa/oJWvVOdDyxQtnmPdp78+/ItOFnXmPdaIl5 wCdjTZ7gBLal+PpTI6roAUlqCxnq+gKttugkOOQLhDKATuHKRR44lBYSgHZOV2cbbp27 WKkGZbmjnh02V2LvI7oypQ9SFoTZEPgys64FNh+Xv+LuZFGzaNbCzgi30oAifZ3NoNSn shfA== X-Gm-Message-State: AFqh2koL4ywFiZqcOEYtIpBIbT5dfJAFtcdiDIzgWsgivjU28RDhGwPy mGezcNQuzBsPSpou+tZKt+l5CA== X-Received: by 2002:a05:600c:34d1:b0:3d7:72e3:f437 with SMTP id d17-20020a05600c34d100b003d772e3f437mr1845751wmq.21.1671633621093; Wed, 21 Dec 2022 06:40:21 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m24-20020a05600c461800b003cfd0bd8c0asm2315210wmo.30.2022.12.21.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D788B1FFB8; Wed, 21 Dec 2022 14:40:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mukilan Thiyagarajan , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Paolo Bonzini , Thomas Huth Subject: [PULL 1/6] configure: Fix check-tcg not executing any tests Date: Wed, 21 Dec 2022 14:40:14 +0000 Message-Id: <20221221144019.2149905-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Mukilan Thiyagarajan After configuring with --target-list=hexagon-linux-user running `make check-tcg` just prints the following: ``` make: Nothing to be done for 'check-tcg' ``` In the probe_target_compiler function, the 'break' command is used incorrectly. There are no lexically enclosing loops associated with that break command which is an unspecfied behaviour in the POSIX standard. The dash shell implementation aborts the currently executing loop, in this case, causing the rest of the logic for the loop in line 2490 to be skipped, which means no Makefiles are generated for the tcg target tests. Fixes: c3b570b5a9a24d25 (configure: don't enable cross compilers unless in target_list) Signed-off-by: Mukilan Thiyagarajan Reviewed-by: Richard Henderson Link: https://patchew.org/QEMU/20221207082309.9966-1-quic._5Fmthiyaga@quicinc.com/ Message-Id: <20221207082309.9966-1-quic_mthiyaga@quicinc.com> Signed-off-by: Alex Bennée Message-Id: <20221221090411.1995037-2-alex.bennee@linaro.org> diff --git a/configure b/configure index 26c7bc5154..7a804fb657 100755 --- a/configure +++ b/configure @@ -1881,9 +1881,7 @@ probe_target_compiler() { # We shall skip configuring the target compiler if the user didn't # bother enabling an appropriate guest. This avoids building # extraneous firmware images and tests. - if test "${target_list#*$1}" != "$1"; then - break; - else + if test "${target_list#*$1}" = "$1"; then return 1 fi From patchwork Wed Dec 21 14:40:15 2022 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: 635634 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3548900pvb; Wed, 21 Dec 2022 06:42:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXsD6vMzZPPeJYCJf7deVGU0xvPTzYk8QMjIOk98pYAiAeqpg2FcizkJR4++rVJCVEODzrxa X-Received: by 2002:a67:ee09:0:b0:3b6:b4e4:df47 with SMTP id f9-20020a67ee09000000b003b6b4e4df47mr668154vsp.9.1671633722642; Wed, 21 Dec 2022 06:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633722; cv=none; d=google.com; s=arc-20160816; b=TGsOGDSvKTgd0NHJK5TBUQog2TTk8AGR9ceKX8BB/1DGmewL3lQRojAQl/zM5GsAQk X3j8ZaJCao1Xzffh2Lbg6rUFioZ6dv08GCHhpaaFtkF0FsiyNEHYSYm8Kx4SW0IX+5Kv aU/EKh+hu8isfi05k7aW4GOIgeLnz27oS+zTiEKVR/J5OcKwhmEme3T6psrpPilVmvk5 tN61HHNVO+HBwTSP+kRafWODefVJ+7C39pK8mo0ZLIz39GalpEIz+E9lP9/8CyG0r7yc AVrUgExfXULJjGVCVUoTIoPyFw01PgFb4FLqUk3fwtW+zPXBaxMhujqYDjl4BoZTioID hLvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=yvIEiOM5aA2Gy38HlTTKUCrD1y1F3I2eMO7xxM9fi9w=; b=V69mN4RMOClZ/iBeoJMFdxCcvVlyCYw54abTspht2Ztit5JbJEoM2Yff5nGDlr30QD VBxseTW6gUffqUyOeBO/sor99/1XMbJaWkm11FSNb9YrUsh2AJyj8ZhR/9QVEtEE7YhX Ap05KwxQ3wkJe8MPnLe1mRIJNQzzhyobuiI+66LKvuaUrv65lrK+0f+kVyKJPf0dFqL2 aBu0a02cGxYhNvScnww5W/lepyH8RWcyg6xFpdSHIbFurgO1pVTp4SZKhrsppao+oh2m uO8ypuzxBoDnMbuuYrxHLcBLowT+zEZ6CeddNd+1j4oCWxV7dfR6UAL5dnXZ/oVIxzI2 uG/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V6P4LQMC; 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=pass (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 pi15-20020a05620a378f00b006fa0dde396esi6096793qkn.507.2022.12.21.06.42.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:42:02 -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=pass header.i=@linaro.org header.s=google header.b=V6P4LQMC; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Go-0006vu-Ms; Wed, 21 Dec 2022 09:40:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Gg-0006uw-2S for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:26 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Gd-0004tY-Dt for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:25 -0500 Received: by mail-wr1-x432.google.com with SMTP id h16so15109446wrz.12 for ; Wed, 21 Dec 2022 06:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yvIEiOM5aA2Gy38HlTTKUCrD1y1F3I2eMO7xxM9fi9w=; b=V6P4LQMCGdMRc0UgENx46XBdjJPSa+2dvDDGUiRKS6+skBM1ghNyAt15oTHpIa2lXk Ytbcbddx85cu6b4iiaWvMAb9mAk8zygXR2CzmV/h/GNe05u3D9H35M19VV88C0eBwVf0 9G/4XgQQz4h/VThyqITnC2yM9u6HgifXXdiuGJObN+WJ/SSAeKnJALiJVQDt6CGde6rn fyWBJ0b5iRI2jMaDkLLAOovlvKn3aqDRUbJ2SbveTQqIsJpFfqkedEg2j5PDTgCXhxgD PnJY01xdIXpF1iUloZ1b2gbvK3wdWCWuZzL/T+aBz+Tz89WmTOSW3nMsgI+Q43x+EGul YG1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yvIEiOM5aA2Gy38HlTTKUCrD1y1F3I2eMO7xxM9fi9w=; b=AOwX9XdkTFQHct0p3F6cSGeuMPZLgexMzOowRD0qQepLyJH2PtVsHuLopWVzfLwzU+ nI6500VVhm/G2xCB6gxNFrmIKVFyYYI8ofj9tB//jGQvAGatzTUgwaumyx7gP3fir55H qZXdyHo5Sk72yszrSbwzGe0bEyqImTD58XhxAAPjfFuG1fXclmipEjuVk/VPsXCBJMWb 9gHP934LDCudZ7HrBzR23UFA7kZaTE2yIYhl9cFNoMDyZidIh70o8DkeCc6Al2sLu3x1 /UqOpw60FKAleqG4g6rCnasYu3AjCFv2IyyJHbdCyEl7z4WnbokoU90LAjs3HNPpoIfG 2tVg== X-Gm-Message-State: AFqh2krz67HhunnoboRGu11Hpqx7SoQza1m79vxwkWGwTqO4myTefAh8 Qyq+FEaHfcaCB1KJqKa/tvNaZw== X-Received: by 2002:a5d:560b:0:b0:242:1ce8:c51c with SMTP id l11-20020a5d560b000000b002421ce8c51cmr1461740wrv.45.1671633621844; Wed, 21 Dec 2022 06:40:21 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id u1-20020a5d6ac1000000b00241cfe6e286sm15436668wrw.98.2022.12.21.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F416F1FFBA; Wed, 21 Dec 2022 14:40:19 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 2/6] gitlab: turn off verbose logging for make check on custom runners Date: Wed, 21 Dec 2022 14:40:15 +0000 Message-Id: <20221221144019.2149905-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The verbosity adds a lot of unnecessary output to the CI logs which end up getting truncated anyway. We can always extract information from the meson test logs on a failure and for the custom runners its generally easier to re-create failures anyway. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221221090411.1995037-3-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index 0c835939db..fcaef9e5ef 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -19,9 +19,9 @@ ubuntu-20.04-s390x-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc` check-tcg V=1 + - make --output-sync -j`nproc` check-tcg || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-all: @@ -40,7 +40,7 @@ ubuntu-20.04-s390x-all: - ../configure --disable-libssh || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-alldbg: @@ -63,7 +63,7 @@ ubuntu-20.04-s390x-alldbg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-clang: @@ -85,7 +85,7 @@ ubuntu-20.04-s390x-clang: - ../configure --disable-libssh --cc=clang --cxx=clang++ --enable-sanitizers || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-20.04-s390x-tci: @@ -127,5 +127,5 @@ ubuntu-20.04-s390x-notcg: - ../configure --disable-libssh --disable-tcg || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc` - - make --output-sync -j`nproc` check V=1 + - make --output-sync -j`nproc` check || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index 1a2f9b8dbe..2c386fa3e9 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -21,5 +21,5 @@ ubuntu-22.04-aarch32-all: - ../configure --cross-prefix=arm-linux-gnueabihf- || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index ce0b18af6f..abeb33eaff 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -19,9 +19,9 @@ ubuntu-22.04-aarch64-all-linux-static: - ../configure --enable-debug --static --disable-system --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; - - make --output-sync -j`nproc --ignore=40` check-tcg V=1 + - make --output-sync -j`nproc --ignore=40` check-tcg || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-all: @@ -43,7 +43,7 @@ ubuntu-22.04-aarch64-all: - ../configure || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-alldbg: @@ -62,7 +62,7 @@ ubuntu-22.04-aarch64-alldbg: || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-clang: @@ -84,7 +84,7 @@ ubuntu-22.04-aarch64-clang: - ../configure --disable-libssh --cc=clang-10 --cxx=clang++-10 --enable-sanitizers || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; ubuntu-22.04-aarch64-tci: @@ -126,5 +126,5 @@ ubuntu-22.04-aarch64-notcg: - ../configure --disable-tcg || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - - make --output-sync -j`nproc --ignore=40` check V=1 + - make --output-sync -j`nproc --ignore=40` check || { cat meson-logs/testlog.txt; exit 1; } ; From patchwork Wed Dec 21 14:40:16 2022 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: 635631 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3548497pvb; Wed, 21 Dec 2022 06:41:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsf8pmGULd3Mea8tcHeAHvHsx/nYR9HBPIKEhKVH1zjYQ6593SgbF6j7XsbgGeLpL/8pYJ8 X-Received: by 2002:a25:34c:0:b0:703:641c:81b3 with SMTP id 73-20020a25034c000000b00703641c81b3mr2253495ybd.0.1671633674969; Wed, 21 Dec 2022 06:41:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633674; cv=none; d=google.com; s=arc-20160816; b=GnrdZhTCJspepmg8REKDIr92JBRKooYaG8PdFn6qG7DJ56vuxC0YlEDWe6cztYLvub /DJ4MWPP8cc/vMhm2KE1POT71UmvWbR5xEnTMCbofAfz5gD+igYPUUpvhJ33L9EzoRqr Mg31zha8htOswJ/ZgO/w/016yAsfqXxsr21GOabayfd86UdXny4J8R1cKDJ0AHAeXDbi Z9ECJ55fyTTXioGm3WLYwEiI8ahhCa0SvzyXSBp/nOmSaCs5JjXG6qNkBJBx2pwcet9t FTfDuGbkQLs9FYyft5vFetoluxjcwpmjmzt7elqbcfKFmlSITHYDrsv3P05uUfy7JSfR mV/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=fpgYus7iOWXvnIUVIMKMYfK2sIKW9bCGOnHmbC/Arqs=; b=fv1Xs0yc8QJKX6wdFsfwvtk/8+Wlvk0sHDxMZttq+8i2Rbktf8GYqhFgO/7rUu9oa2 4q0/aJBhK40dn2OlzEDfGmpoyiSLaIpyoXh7F7d0573MDRvR0SjgoUIL0PiWXj5ShmvF rcHEaDNUUn+mQe7R9RK0twd4TRMgICqsezmHakicpg7xhx2W1sE3QMn/KTuQ7me0Svpr ydJ8+74uDF9OIevP+Hgk4yYDQOANorFO+hhrkNBKbPMDe+AzPmRqhpa7G8kk2e71OxtV GBsfnp5+WhjrhZmpKJ4F6b8vp8VX0RzKmM2UTK2NavF6ipMddNJP+Z562+J3EQYYWhEt V1PA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KN8rViwK; 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=pass (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 13-20020a37060d000000b006ce230b6c15si6060988qkg.139.2022.12.21.06.41.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:41:14 -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=pass header.i=@linaro.org header.s=google header.b=KN8rViwK; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Gg-0006vM-Sg; Wed, 21 Dec 2022 09:40:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Gf-0006uu-UN for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:25 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Gd-0004te-FY for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:25 -0500 Received: by mail-wr1-x42b.google.com with SMTP id m14so15144326wrh.7 for ; Wed, 21 Dec 2022 06:40:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fpgYus7iOWXvnIUVIMKMYfK2sIKW9bCGOnHmbC/Arqs=; b=KN8rViwKS1RaBRjTWIm9VwiRhE6hnaaCPrT3uwJIIs8NaaaCGocozEdf84CQxW7Qwl AoJHYnOXL/0a/YOxfmWD9p/lQe73LoB/6fZcR+CTkNuKzx44D3Y8Pi93HbKJaoYu4otQ XxauMSvvDRtZBNi9HGs3hs55Pe+j7Q0CL72j38s6O6Y/zhOl1s4JdCM3z+xUq4k6DyhO PQpHETfHo5IczaOTgd00ntH9/B4L3wVBvzXakHGKD2zZKN4qhf37ossjNuZ4n5QEfvgU qpY34Vvd5VNqg/qUiOJk3O83yggDz/B6prXi9jd+eVB09g9m227DUPzeQaSdGZEogYTa sREw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fpgYus7iOWXvnIUVIMKMYfK2sIKW9bCGOnHmbC/Arqs=; b=KcZ+tJhkgkZLeJRNFk9SVZpS1SCCZP7Fae9YsNhuxidVIYtTdUPMd3Ky+GVh6I0H/4 q9p5VBF7qrgs/7nvd4fbVvQUiEh7VqSaLLRPPrYyYNHzZ/LHjTmT379oL00TYk9B3NpH gAz6mX5TMP7cKZn0waK6v7lUgLPPArG9qF2Siv6l+uZ9t6T5uf5HsbXKd5UMCApvlCjx /R+dXaUduED1VpPiZv0yRy9SksovLaDMpWGQw+Bz9Ho0dcmqrD8s+SA3vycWLqBqv0bf p3iq0G62qx+1w5MUPGxuvf5YcuhANCSzlr6N3ATZcvbLEucaCo1Gc7jcwBKjDevOmshR OEuQ== X-Gm-Message-State: AFqh2kox+HFZp86r90r0mWuUuBliGf8p0jSjS6zRCpIOBy0X4uAtV8tD 2WslXkZuH4NHJeRKZD4IOIpENQ== X-Received: by 2002:a5d:6b11:0:b0:24b:6cc7:a61b with SMTP id v17-20020a5d6b11000000b0024b6cc7a61bmr1666222wrw.41.1671633622104; Wed, 21 Dec 2022 06:40:22 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z1-20020a5d6541000000b00241f029e672sm15314141wrv.107.2022.12.21.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1555A1FFBB; Wed, 21 Dec 2022 14:40:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PULL 3/6] configure: repeat ourselves for the benefit of CI Date: Wed, 21 Dec 2022 14:40:16 +0000 Message-Id: <20221221144019.2149905-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Our CI system echos the lines it executes but not the expansions. For the sake of a line of extra verbosity during the configure phase lets echo the invocation of script to stdout as well as the log when on CI. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221221090411.1995037-4-alex.bennee@linaro.org> diff --git a/configure b/configure index 7a804fb657..d89e883844 100755 --- a/configure +++ b/configure @@ -83,9 +83,10 @@ rm -f config.log # Print a helpful header at the top of config.log echo "# QEMU configure log $(date)" >> config.log printf "# Configured with:" >> config.log -printf " '%s'" "$0" "$@" >> config.log -echo >> config.log -echo "#" >> config.log +# repeat the invocation to log and stdout for CI +invoke=$(printf " '%s'" "$0" "$@") +test -n "$GITLAB_CI" && echo "configuring with: $invoke" +{ echo "$invoke"; echo; echo "#"; } >> config.log quote_sh() { printf "%s" "$1" | sed "s,','\\\\'',g; s,.*,'&'," From patchwork Wed Dec 21 14:40:17 2022 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: 635635 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3549073pvb; Wed, 21 Dec 2022 06:42:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXvOCOAug+71PPUrd6uhNAffUTfE4G/0h0A01GPe/jiBD2hDVWzgpSseSjIuv4bA//tusZ/+ X-Received: by 2002:a05:6214:1fd8:b0:51f:3ce9:3911 with SMTP id jh24-20020a0562141fd800b0051f3ce93911mr2867117qvb.26.1671633742766; Wed, 21 Dec 2022 06:42:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633742; cv=none; d=google.com; s=arc-20160816; b=aGnDoklzZJpm47P+gagBMNhVUL17iNfpQYaYRWek5FS5nWRMM164osQQER5MpX8rsY nul69HPvnorrAqnwNmInxVDrJ1TwaXFIU++udjO75aB1Takewlv1uwcFsIBoRmAL7t3s 6LXcPZ5P2/O1EQeY8j+xgbuBkorW7GncU4S+fra6w6BiYR0O6pgY95WoMphfNB5sz3+5 Fub8uGu7XelnY6+kHlH5PLTj/zPcLeRmgaod24GcRcut4r/5palG8gQdvZ1i2l5hxPmw cNRi+tYyodecehL2CntoNoze17zLPro4jKO5fErteM4Uga32zYBXkINge4PYUsWDgYLo MMoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=3E08cP9uQJJb13y/tK6ptN3WodIQyLPwxmDugVOqWPI=; b=blhjFnC3hnWCz7UQAGLteoTgGIpld4P8wnIEKPpX9T6R9lgmT0UuEw/3me/OOWZfO0 WTzHx3M1k1e+b8hzKxcMfz4lKwoVcRDEAia7ZqpMm5mBVBeXIrGRsd/gX9//KNBN4A72 h71085O3V6kjRFrKOtJhj4CNgW5kgx1ckU3RsAp3H5Pt9rrltQSvZLlDWF4e4ndsY2/u T35RufRnutu2nqIryZMZZMcGTMQefTGt+UgcTFvUBk28Nto+ZzXaHvJLPuOlnt5+Ge91 Hu+cVtvLt/2nseyxD4z/ubojolfzxlE2ioigCnQHu30pCKl0A40jsQWSonzVxnNfJxob d1KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sEuYNfm8; 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=pass (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 gv5-20020a056214262500b004bb62e51dfdsi6299633qvb.538.2022.12.21.06.42.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:42:22 -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=pass header.i=@linaro.org header.s=google header.b=sEuYNfm8; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Gm-0006vs-DZ; Wed, 21 Dec 2022 09:40:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Gg-0006v6-6r for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:26 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Ge-0004u1-Ic for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:25 -0500 Received: by mail-wr1-x42f.google.com with SMTP id m14so15144341wrh.7 for ; Wed, 21 Dec 2022 06:40:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3E08cP9uQJJb13y/tK6ptN3WodIQyLPwxmDugVOqWPI=; b=sEuYNfm8/SlqxF5//bi/DXEs8e5XgV3tF7jltMyBT+GWf+8uamX6KQaglfQIwPnUn1 nIg98xOdGTAqNvvl7Dn6ZFu0fOKKSEKKJHjX47YxbkTSxx7EZ3ny1RhDEFQaRhLgES9h w9363YAF9H5Z9c+c2+1zV2Goj5NeIHsF6L7pROYTgBm0JB2Rm+IYTyPb8ceyRJrzFeW0 PlBrIaGiJxiQ36W9ZU2ZnoLk4I79Y/aflJe3CORDvp5tJdzcOFgJNj21jaaGSfjuB78k z7G043xHO6F+k7B0cX0z7Ag5suxtN6Yp/Ql/BP1Wwy6/y29F6DZqzfdL+SVp0u/uDbzr mlFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3E08cP9uQJJb13y/tK6ptN3WodIQyLPwxmDugVOqWPI=; b=gXI2z9R2g2+hXxxkWlKIE4gNHGQir75Rlu0vruzz4/znFFNJpT2qyWydtzOuK1f0Xf 5Xxxm+x3UFh2++GB2Ju3P+Ma3myAbwGvRfwa8Glt+oR2Bv5FZ9JYUTfkmrAjlXQ+X+fL gFZ+38eZ1F8nIeTF0mf62SR9lPjGkscmAq+0wAn7y4AxUZS6j8uOjSZ+KPfjRZpaZ76f SlnF5yfmhXg95NvGKjS3N4krx5YZUvB22e3qw+Y8k8S2iILUIWly/YouDyS9KgANiCW0 6tMwGBWfT9cENIWeJakQWGlFypqGoE+Yxjrw2bFMLkBkcKWf6I8Qb3yeKYl7mGXrFZ8g E9Hw== X-Gm-Message-State: AFqh2kq0zp4uwTv5IZEThq4CKa14ULMDXz6HaHK5th6hp7wVo/5GjuhT FBxXR6nfnne47nRLnzw89IZVAg== X-Received: by 2002:adf:f1c9:0:b0:242:1d69:1ba1 with SMTP id z9-20020adff1c9000000b002421d691ba1mr1478462wro.44.1671633622756; Wed, 21 Dec 2022 06:40:22 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l17-20020a5d5611000000b002424b695f7esm15406171wrv.46.2022.12.21.06.40.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2ABB01FFBC; Wed, 21 Dec 2022 14:40:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= Subject: [PULL 4/6] tests/tcg: fix unused variable in linux-test Date: Wed, 21 Dec 2022 14:40:17 +0000 Message-Id: <20221221144019.2149905-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The latest hexagon compiler picks up that we never consume wcount. Given the name of the #define that rcount checks against is WCOUNT_MAX I figured the check just got missed. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221221090411.1995037-5-alex.bennee@linaro.org> diff --git a/tests/tcg/multiarch/linux/linux-test.c b/tests/tcg/multiarch/linux/linux-test.c index 5a2a4f2258..64f57cb287 100644 --- a/tests/tcg/multiarch/linux/linux-test.c +++ b/tests/tcg/multiarch/linux/linux-test.c @@ -354,13 +354,17 @@ static void test_pipe(void) if (FD_ISSET(fds[0], &rfds)) { chk_error(read(fds[0], &ch, 1)); rcount++; - if (rcount >= WCOUNT_MAX) + if (rcount >= WCOUNT_MAX) { break; + } } if (FD_ISSET(fds[1], &wfds)) { ch = 'a'; chk_error(write(fds[1], &ch, 1)); wcount++; + if (wcount >= WCOUNT_MAX) { + break; + } } } } From patchwork Wed Dec 21 14:40:18 2022 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: 635632 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3548499pvb; Wed, 21 Dec 2022 06:41:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXttsUoqwoQVgBx/tIPsrhyZKPrMXsKnP8+YNdXcrL+psSDhH+dfm2xyCTHp+Zm+FVsWBac2 X-Received: by 2002:ac8:4793:0:b0:3a8:1c63:7603 with SMTP id k19-20020ac84793000000b003a81c637603mr2392130qtq.57.1671633674989; Wed, 21 Dec 2022 06:41:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633674; cv=none; d=google.com; s=arc-20160816; b=jnXhf+0VyC5xhIe2bAjIdtR/7sC04Wt7sMTiaaH4ze3Tw8ooUkqmSkMDvFZXsd5PWz laWdL/Z7hSF93y2uyxRpo/0wwVA4FDfAGuF3a8yjn9dCT/kwJpPfNr04kL7z8BKgGAvw vrO8xg55rNj2Ns1724CIQItRBdB7aLSCWp83z+GHE1QmKEH1pm++YrZwPoa3m9qE2pAE OSAN/SQu85RMPritwuSGuiaoyj7eeOnhCCv12w9qbhAJLLJwNaXJFHJk/PCC9k931IrF hI9/kWToZr4R0QxzbSm0eZlkpeBk3RTthhe+m27MtKnNGdxIZ80JFPrKEw2W0rBTcdCB +w2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=/BzUCH08O3nWOuUAzYUGUksM/F28uYI4tnGUg0XvC0A=; b=oXL/f1c+wpsXdS8Id3EQMAWv3ULz/XqWLEu5iGT3m+t8EojlAHVp48SapNw0nrzBb3 8pezi+PxD9uzzJTH59o99ZfIpLJGwb50Hr8QqPECinPdZsE5c+myM1rtO9AcP4TYbEAM jGs/AZgGTHuw3mEMoCeJa4nHpKiEckM7JTzAsQ5XGIHiN28m6TaVJvm7cVoTwjlntNhh plqc2s7XjO45vzKm/d7Ds/+t7OsUWmQzOOspW6DUfR4Vk5XrIE5jwJjER4ZvTZ4jV6V4 +myqt4rA/xeh9b8vd2zLXCD/rMWkfiicPgEeYSY/mjhp2gx7jIYOjy2gS9jeeLCcsPhq WR4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vKsvuPYy; 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=pass (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 fz6-20020a05622a5a8600b0039c7bb479afsi6624403qtb.5.2022.12.21.06.41.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:41:14 -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=pass header.i=@linaro.org header.s=google header.b=vKsvuPYy; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Gq-0006xr-Hk; Wed, 21 Dec 2022 09:40:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Gl-0006vX-CH for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:31 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Gf-0004uk-NA for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:29 -0500 Received: by mail-wr1-x42c.google.com with SMTP id h7so15158130wrs.6 for ; Wed, 21 Dec 2022 06:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/BzUCH08O3nWOuUAzYUGUksM/F28uYI4tnGUg0XvC0A=; b=vKsvuPYyV/nsxMHKmbZZoPPBFROhsfOU6bCb4EnSVS8ed6Ak5vfo3cu9zV8rc2pnXj l0N9i79ZyMiSeu68Ju2bZJ+ThPkVlnz331K75d1oT7uNCD+cwZ7iZPzcTnEQ6KIugpZe tUA1h9EqtQYLGlRaqdu2KPQs5S4KS0ZSSvqCJ2zAKxMxCrZvpVwwjdohDnRQoIu1mySf wKndzPFEWIuvl/nt4cV8hCTTVPEe4Rped/dk3S8ZBybSJ8Orb+i2ZDKxFEOcII+1jvkt hzLPh1dD9TIelfnwwvKVd7MgTc9ZIHhEwTkLUTgLpvk7C8ZQ4AP01iRM3dbCdDSWNimm 5PLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/BzUCH08O3nWOuUAzYUGUksM/F28uYI4tnGUg0XvC0A=; b=augjBleP+mIMW/1hFy45dCgpBxsKjRPwdpn1L9QjXFlxJoZrrQoa7gDm4b3KB2SN53 Ds/kLtaQ+P4VWjp4JSGZxYtS7zWTc2BNzwFMwvowh3u6WcWOW5zS6fMj6pJ7ney4Vvs8 OghP2QxtwKTbTQq8SrTjA9VK74rntcHqksAEtJNoAvkiehXGrAL6S9H3FRP/gA92Ycfj LW1AE5dKHtCiTkqLwPioMVjbGGK6qJNf/Er7aZSfs5BD2M/RYsdgBTkxD96Cr6XnltrN yD2MuU7Fv//oSkSlcvfJ705lwoQdTVYmw7HeATRezQfBOAxMgySa3W97rUyt0CXa1yRT xLzA== X-Gm-Message-State: AFqh2kpph0N/p37YU0wtDeOkpyJ2Xk6pQ0zzg1UA1JqCaCFYnUPxEIzz d5wFTqxmLU1qHsl4NYvXB2enHnHT6DC6ApD6 X-Received: by 2002:a5d:4a41:0:b0:24f:5890:616b with SMTP id v1-20020a5d4a41000000b0024f5890616bmr3592898wrs.56.1671633623786; Wed, 21 Dec 2022 06:40:23 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id k12-20020adff28c000000b0022e57e66824sm17900597wro.99.2022.12.21.06.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4DC821FFBD; Wed, 21 Dec 2022 14:40:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mukilan Thiyagarajan , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 5/6] tests/docker: use prebuilt toolchain for debian-hexagon-cross Date: Wed, 21 Dec 2022 14:40:18 +0000 Message-Id: <20221221144019.2149905-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Mukilan Thiyagarajan The current docker image for cross compiling hexagon guests is manually built since it takes >2 hours to build from source. This patch: 1. Solves the above issue by using the prebuilt clang toolchain hosted on CodeLinaro [1] and maintained by QUIC [2]. 2. The dockerfile is also switched from multi-stage to single stage build to allow the CI docker engine to reuse the layer cache. 3. Re-enables the hexagon-cross-container job to be always run in CI and makes it a non-optional dependency for the build-user-hexagon job. The changes for 1 & 2 together bring down the build time to ~3 minutes in GitLab CI when cache is reused and ~9 minutes when cache cannot be reused. [1]: https://github.com/CodeLinaro/hexagon-builder [2]: https://github.com/quic/toolchain_for_hexagon/releases/ Signed-off-by: Mukilan Thiyagarajan [AJB: also tweak MAINTAINERS] Signed-off-by: Alex Bennée Message-Id: <20221219144354.11659-1-quic_mthiyaga@quicinc.com> Message-Id: <20221221090411.1995037-6-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d21b4a1fd4..93302a96e2 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -275,14 +275,10 @@ build-user-static: CONFIGURE_ARGS: --disable-tools --disable-system --static MAKE_CHECK_ARGS: check-tcg -# Because the hexagon cross-compiler takes so long to build we don't rely -# on the CI system to build it and hence this job has an optional dependency -# declared. The image is manually uploaded. build-user-hexagon: extends: .native_build_job_template needs: job: hexagon-cross-container - optional: true variables: IMAGE: debian-hexagon-cross TARGETS: hexagon-linux-user diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 2d560e9764..5486dc43c6 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -37,28 +37,11 @@ armhf-debian-cross-container: # We never want to build hexagon in the CI system and by default we # always want to refer to the master registry where it lives. hexagon-cross-container: - extends: .base_job_template - image: docker:stable + extends: .container_job_template stage: containers variables: NAME: debian-hexagon-cross - GIT_DEPTH: 1 QEMU_JOB_ONLY_FORKS: 1 - services: - - docker:dind - before_script: - - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - - docker info - - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" - script: - - echo "TAG:$TAG" - - echo "COMMON_TAG:$COMMON_TAG" - - docker pull $COMMON_TAG - - docker tag $COMMON_TAG $TAG - - docker push "$TAG" - after_script: - - docker logout hppa-debian-cross-container: extends: .container_job_template diff --git a/MAINTAINERS b/MAINTAINERS index 716d5a24ad..005a2d3ed2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -204,7 +204,6 @@ F: tests/tcg/hexagon/ F: disas/hexagon.c F: configs/targets/hexagon-linux-user/default.mak F: docker/dockerfiles/debian-hexagon-cross.docker -F: docker/dockerfiles/debian-hexagon-cross.docker.d/build-toolchain.sh Hexagon idef-parser M: Alessandro Di Federico diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index fc7a3b7e71..665ddde518 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -109,10 +109,6 @@ debian-toolchain-run = \ "PREPARE", $1)) debian-toolchain = $(call debian-toolchain-run,$(patsubst docker-image-%,%,$1)) -docker-image-debian-hexagon-cross: $(DOCKER_FILES_DIR)/debian-hexagon-cross.docker \ - $(DOCKER_FILES_DIR)/debian-hexagon-cross.d/build-toolchain.sh - $(call debian-toolchain, $@) - docker-image-debian-microblaze-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-microblaze-cross.d/build-toolchain.sh $(call debian-toolchain, $@) diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh b/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh deleted file mode 100755 index 19b1c9f83e..0000000000 --- a/tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh +++ /dev/null @@ -1,141 +0,0 @@ -#!/bin/bash - -set -e - -BASE=$(readlink -f ${PWD}) - -TOOLCHAIN_INSTALL=$(readlink -f "$TOOLCHAIN_INSTALL") -ROOTFS=$(readlink -f "$ROOTFS") - -TOOLCHAIN_BIN=${TOOLCHAIN_INSTALL}/bin -HEX_SYSROOT=${TOOLCHAIN_INSTALL}/hexagon-unknown-linux-musl -HEX_TOOLS_TARGET_BASE=${HEX_SYSROOT}/usr - -function cdp() { - DIR="$1" - mkdir -p "$DIR" - cd "$DIR" -} - -function fetch() { - DIR="$1" - URL="$2" - TEMP="$(readlink -f "$PWD/tmp.tar.gz")" - wget --quiet "$URL" -O "$TEMP" - cdp "$DIR" - tar xaf "$TEMP" --strip-components=1 - rm "$TEMP" - cd - -} - -build_llvm_clang() { - fetch "$BASE/llvm-project" "$LLVM_URL" - cdp "$BASE/build-llvm" - - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=${TOOLCHAIN_INSTALL} \ - -DLLVM_ENABLE_LLD=ON \ - -DLLVM_TARGETS_TO_BUILD="Hexagon" \ - -DLLVM_ENABLE_PROJECTS="clang;lld" \ - "$BASE/llvm-project/llvm" - ninja all install - cd ${TOOLCHAIN_BIN} - ln -sf clang hexagon-unknown-linux-musl-clang - ln -sf clang++ hexagon-unknown-linux-musl-clang++ - ln -sf llvm-ar hexagon-unknown-linux-musl-ar - ln -sf llvm-objdump hexagon-unknown-linux-musl-objdump - ln -sf llvm-objcopy hexagon-unknown-linux-musl-objcopy - ln -sf llvm-readelf hexagon-unknown-linux-musl-readelf - ln -sf llvm-ranlib hexagon-unknown-linux-musl-ranlib - - # workaround for now: - cat < hexagon-unknown-linux-musl.cfg --G0 --sysroot=${HEX_SYSROOT} -EOF -} - -build_clang_rt() { - cdp "$BASE/build-clang_rt" - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release \ - -DLLVM_CONFIG_PATH="$BASE/build-llvm/bin/llvm-config" \ - -DCMAKE_ASM_FLAGS="-G0 -mlong-calls -fno-pic --target=hexagon-unknown-linux-musl " \ - -DCMAKE_SYSTEM_NAME=Linux \ - -DCMAKE_C_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ - -DCMAKE_ASM_COMPILER="${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang" \ - -DCMAKE_INSTALL_PREFIX=${HEX_TOOLS_TARGET_BASE} \ - -DCMAKE_CROSSCOMPILING=ON \ - -DCMAKE_C_COMPILER_FORCED=ON \ - -DCMAKE_CXX_COMPILER_FORCED=ON \ - -DCOMPILER_RT_BUILD_BUILTINS=ON \ - -DCOMPILER_RT_BUILTINS_ENABLE_PIC=OFF \ - -DCMAKE_SIZEOF_VOID_P=4 \ - -DCOMPILER_RT_OS_DIR= \ - -DCAN_TARGET_hexagon=1 \ - -DCAN_TARGET_x86_64=0 \ - -DCOMPILER_RT_SUPPORTED_ARCH=hexagon \ - -DLLVM_ENABLE_PROJECTS="compiler-rt" \ - "$BASE/llvm-project/compiler-rt" - ninja install-compiler-rt -} - -build_musl_headers() { - fetch "$BASE/musl" "$MUSL_URL" - cd "$BASE/musl" - make clean - CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - CROSS_COMPILE=hexagon-unknown-linux-musl \ - LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CROSS_CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ - ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} - PATH=${TOOLCHAIN_BIN}:$PATH make CROSS_COMPILE= install-headers - - cd ${HEX_SYSROOT}/.. - ln -sf hexagon-unknown-linux-musl hexagon -} - -build_kernel_headers() { - fetch "$BASE/linux" "$LINUX_URL" - mkdir -p "$BASE/build-linux" - cd "$BASE/linux" - make O=../build-linux ARCH=hexagon \ - KBUILD_CFLAGS_KERNEL="-mlong-calls" \ - CC=${TOOLCHAIN_BIN}/hexagon-unknown-linux-musl-clang \ - LD=${TOOLCHAIN_BIN}/ld.lld \ - KBUILD_VERBOSE=1 comet_defconfig - make mrproper - - cd "$BASE/build-linux" - make \ - ARCH=hexagon \ - CC=${TOOLCHAIN_BIN}/clang \ - INSTALL_HDR_PATH=${HEX_TOOLS_TARGET_BASE} \ - V=1 \ - headers_install -} - -build_musl() { - cd "$BASE/musl" - make clean - CROSS_COMPILE=hexagon-unknown-linux-musl- \ - AR=llvm-ar \ - RANLIB=llvm-ranlib \ - STRIP=llvm-strip \ - CC=clang \ - LIBCC=${HEX_TOOLS_TARGET_BASE}/lib/libclang_rt.builtins-hexagon.a \ - CFLAGS="-G0 -O0 -mv65 -fno-builtin -fno-rounding-math --target=hexagon-unknown-linux-musl" \ - ./configure --target=hexagon --prefix=${HEX_TOOLS_TARGET_BASE} - PATH=${TOOLCHAIN_BIN}/:$PATH make CROSS_COMPILE= install - cd ${HEX_TOOLS_TARGET_BASE}/lib - ln -sf libc.so ld-musl-hexagon.so - ln -sf ld-musl-hexagon.so ld-musl-hexagon.so.1 - cdp ${HEX_TOOLS_TARGET_BASE}/../lib - ln -sf ../usr/lib/ld-musl-hexagon.so.1 -} - -build_llvm_clang -build_kernel_headers -build_musl_headers -build_clang_rt -build_musl diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index c4238e893f..8a0d748343 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -7,44 +7,29 @@ # FROM docker.io/library/debian:11-slim -# Install common build utilities -RUN apt update && \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bison \ +# Install common build utilities + apt-get install -y --no-install-recommends \ + curl \ + xz-utils \ ca-certificates \ - clang \ - cmake \ + bison \ flex \ - gcc \ - lld \ - make \ - ninja-build \ - python3 \ - rsync \ - wget \ - xz-utils - -ENV TOOLCHAIN_INSTALL /usr/local -ENV ROOTFS /usr/local - -ENV LLVM_URL https://github.com/llvm/llvm-project/archive/bfcd21876adc3498065e4da92799f613e730d475.tar.gz -ENV MUSL_URL https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz -ENV LINUX_URL https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz - -ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh - -RUN cd /root/hexagon-toolchain && ./build-toolchain.sh - -FROM docker.io/library/debian:11-slim -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + git \ + ninja-build && \ # Install QEMU build deps for use in CI -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata apt install -yy bison flex git ninja-build && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt build-dep -yy --arch-only qemu -COPY --from=0 /usr/local /usr/local -ENV PATH $PATH:/usr/local/bin/ + + +ENV TOOLCHAIN_INSTALL /opt +ENV TOOLCHAIN_RELEASE 15.0.3 +ENV TOOLCHAIN_BASENAME "clang+llvm-${TOOLCHAIN_RELEASE}-cross-hexagon-unknown-linux-musl" +ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-for-hexagon/v${TOOLCHAIN_RELEASE}/${TOOLCHAIN_BASENAME}.tar.xz + +RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" +ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin From patchwork Wed Dec 21 14:40:19 2022 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: 635636 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3549177pvb; Wed, 21 Dec 2022 06:42:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXsMP7hilMbHgL70YkK8zhKVHzcdL+ipb5AF9t/VLv5n5cq1PkXtt/hX7APs7PMqcv+7XhlQ X-Received: by 2002:a25:9209:0:b0:6ca:525a:4096 with SMTP id b9-20020a259209000000b006ca525a4096mr1718779ybo.52.1671633754728; Wed, 21 Dec 2022 06:42:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671633754; cv=none; d=google.com; s=arc-20160816; b=aRa3vF6Q3si5n1RXVN52JaWU9Nam7SnsPdpGa+h8oqpGj5Y/eGpvhUIbZjS9e738bO ooaOeUfcB32UeBnilGLJEqmWEp8q3l+f0bhAPMpPlHisntJm4XcoC+e3g9dyIHpESCa/ HbW+vewhQsWJLIWyfYiZvySqprWTH7MF9uOTqXa24ibe4jxJ5ouhor9JyRY++UeO1Lgi vHbohwzBygUWvxoJ/GT3x8UpS8oa02AP0W+EWdfUt3FPbUhTYQU0k1MnmyywtVLlIMik 4H06ZU68lv53Eu6yQFW3KCp9LIIxGH/4rFl64T3/Z3oNvoa/iQvFtXO2LR8n9nemztO7 M6Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=dCCnviiSQJfntmqTkYMuxNDewciBaYWqEuBpg+sqhS0=; b=B9LaxPDp3J3+RfwvZJyD13/Ilz4vhdvyZAbz9j+KXvNbGFBXyBtZ0Pn5LSMXaoEHEA JBWWgrGH7kGmGFxAq3xrSXhBtLE+Gp8R/qKkY4+b6/GwaaEBXsqIReBIybWno95e5cFP zonQzeZZUOQMY4JdUt7Qkp5u2nyoQlXImu/0roFd/8gu2JAHWWvvgszFu8vd+Y8+6J6v KIADYZQ/iw4hx/mfeD8fLnlu3zt15BI7wW6ourYJZAeD8XXHjC9pRBM+TvtdmmvpYlis d3AYBekdVqOhzuXuqYJxpzMRhqw2xm1VlXXhLsj3U8ZuKIibsXQBBDDPfr4SvzTTBj3g 1mKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LoIGZLGc; 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=pass (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 h6-20020a05620a13e600b006fbaa4b7818si6002603qkl.693.2022.12.21.06.42.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 06:42:34 -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=pass header.i=@linaro.org header.s=google header.b=LoIGZLGc; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p80Gr-0006yO-5b; Wed, 21 Dec 2022 09:40:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p80Gh-0006vN-60 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:31 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p80Gf-0004uI-8D for qemu-devel@nongnu.org; Wed, 21 Dec 2022 09:40:26 -0500 Received: by mail-wm1-x331.google.com with SMTP id o15so11315815wmr.4 for ; Wed, 21 Dec 2022 06:40:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dCCnviiSQJfntmqTkYMuxNDewciBaYWqEuBpg+sqhS0=; b=LoIGZLGcgKDCQnOEpvpiJ4iOeqz3QPfJBrPuuleIarEZMB6iywN1oumdeZ7xIUuX/Q KxHufPhSYHUv1wGjnRNrdxt8vVvXD0T3bKnmYsoklR8nA/HCjVzLQW+qdtHeog4OurIB MG3wc0LqHmwwsH9zHTrFtddgEvQQq3k0CFkE2RKqnWS6Ie9Aj5RkEuHKgkAyEe5Wvmuw 4boLID+WxzIbwuVIYF2G5CKQrDwEWDVzMc9eryYhXoPVwCq47xU6s4XvYHu6MSfp4ALH Gk6xTrjjYPiqexVvWntAvF3EQVgR2msmhrvkA0/PmSXslfDedO1LntBdDKaZ/CGLI7qN i4dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dCCnviiSQJfntmqTkYMuxNDewciBaYWqEuBpg+sqhS0=; b=jFYwcZK75hFsWo1kc0Dh7oAIoyvYKz5xchNSExLss/VtRt4FXKZEeqKdgcec2l9uV9 qMiyEjPPPlyYOgqvOanmXKacPBkWQIg+UIDR0i0ta0TcqSyPNQV502KCTugjn63xLHDL CAwsthXheuZLvxGoqPNhBHsBYzdTyEYy1v7IeJOS7O9nKkmlb1T4pUrTRKby0KPaajSd O4RCA0FWLRlWyAj9QyBmJBa/UzfGL1wNXSl5OPPsGA2PY5tcaeQgfDSY9uskPLDgOExJ vBFeV5OV6yvMMl7MW/BgXcym4RznpzDoVu2y22Cywvs3TlZ6E8ENFLdLhwbCGSY15G2X wo3Q== X-Gm-Message-State: AFqh2ko/RVGtZFFQUMEs3aDjUK8npuCQ4NKm+lYW5EYy7Vv0ZaVOnLLk iNLWuIhiEKMbtKcAOaWPGyKQog== X-Received: by 2002:a05:600c:3b83:b0:3d3:864a:116e with SMTP id n3-20020a05600c3b8300b003d3864a116emr1831295wms.26.1671633623478; Wed, 21 Dec 2022 06:40:23 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o27-20020a05600c511b00b003c6f8d30e40sm2829881wms.31.2022.12.21.06.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 06:40:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 640931FFBE; Wed, 21 Dec 2022 14:40:20 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Thomas Huth , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 6/6] gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs Date: Wed, 21 Dec 2022 14:40:19 +0000 Message-Id: <20221221144019.2149905-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221144019.2149905-1-alex.bennee@linaro.org> References: <20221221144019.2149905-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth These jobs use their own "script:" section and thus do not profit from the global "--disable-docs" from the template. While we're at it, disable also some GUI front ends here since we do not gain any additional test coverage by compiling those here again. Signed-off-by: Thomas Huth Message-Id: <20221208135945.99975-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20221221090411.1995037-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 93302a96e2..f09a898c3e 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -244,6 +244,7 @@ build-tcg-disabled: - mkdir build - cd build - ../configure --disable-tcg --audio-drv-list="" --with-coroutine=ucontext + --disable-docs --disable-sdl --disable-gtk --disable-vnc || { cat config.log meson-logs/meson-log.txt && exit 1; } - make -j"$JOBS" - make check-unit @@ -530,8 +531,9 @@ build-tci: - TARGETS="aarch64 alpha arm hppa m68k microblaze ppc64 s390x x86_64" - mkdir build - cd build - - ../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; } + - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc + --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 tests/qtest/boot-serial-test tests/qtest/cdrom-test tests/qtest/pxe-test - for tg in $TARGETS ; do