From patchwork Wed Dec 21 09:04:06 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: 635613 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3399712pvb; Wed, 21 Dec 2022 01:05:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXvCHGMDmEWhp5m6s7d51PHV3dW9eIUyIRxQbvNQehAdGKmDgqR9sKjkaqfwbR+2UlEMfMpq X-Received: by 2002:ac8:5f0f:0:b0:3a6:2170:b089 with SMTP id x15-20020ac85f0f000000b003a62170b089mr1080491qta.12.1671613530843; Wed, 21 Dec 2022 01:05:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613530; cv=none; d=google.com; s=arc-20160816; b=Bgw+1FPlsO1jqkESIfhGyetPF0vDblyCxKxz0CkkXmoIw2ll8FSSz2ibjzJOYpiWQx biatgNbMX61JRCnCoxtJzaCCOsyDzxKdx1ZZp2T1Nx617bWG7IssdlByJ/dg5zv4kzNE BtLC5FTJk0nYHqorP1u077W3EOGWfwY/aVYwpWcVqLgKx9e2Lc4wQRDllX+VM0ZxgPXZ QUACfxvrs+Isw4fes1B0hqW7d9h4RFL/T2068WAKxM9vE+4YHvJLsH8Xqdf6mjXd6j7v bGYQbuZSPLGqTcThJ5BK4nLyTXSZdSJcstWHYTICeKEitOiqB3BLk+DtqZbRGMcp7whP 5NZQ== 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=etP2h5UOgxyD1g2PWXehDiF8c3xFUHhjjtIkvhRulcs=; b=oWkPo0f6M85CyablEef9plqTa4fbb3w2rgIs4EuSB/8E8U7ZP0Tx01U5E89u+L5YPN lOVp+kks4fOr48xOQkYu0mGmVjbSJ24RZzFa4gJ06kVGVTZA8berWqCKE1B7d9XnanEN MlDqmemc5rlhHr3eIrU4NB69WjMSDetP7HkRz+PrDADY9WJTejkeCR7cabYsK8m6Dvtw fgsykcXioxn/A7VcE7A9YM2ji54o8ENF/mBk3yvdtfS0h27rqT9FJbh0HpAfkS4khsPW SkrKj7eJOWtilap+6h1BDiG/d/6IFpmJYAAsM90l+cplxhA9SVnrypDaTSJnwV8Atx0k CWlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hXHgtb5e; 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-20020a05620a400600b006fee65927d2si1581550qko.214.2022.12.21.01.05.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:05:30 -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=hXHgtb5e; 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 1p7v1S-00006t-TI; Wed, 21 Dec 2022 04:04:23 -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 1p7v1M-00006Q-D5 for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:16 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7v1K-0000Dt-Ff for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:16 -0500 Received: by mail-wm1-x32b.google.com with SMTP id ja17so10664800wmb.3 for ; Wed, 21 Dec 2022 01:04:14 -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=etP2h5UOgxyD1g2PWXehDiF8c3xFUHhjjtIkvhRulcs=; b=hXHgtb5ez0wRnqQiZ9aT4kJ594Uncy8L7tV2J/pkDVcwSgh6mPXsfyhzY2jufoCeuf OY4rNGhkW9r/two6Zi9C1a4fq7gS83xPC0NMhu0YYQM52SodSMSOczMAFMuxrHkGG+g1 svoZtB6VPTNGEMrRmxn0SqJHLTfvH72his8CNsEz6fJAtck+OwXuir+GsH/Qf83Nak5P UT5bIksNM+hFRLRscsJ4kNppdJDJaUZPPMGDSj1p+L75PJWFLzqcaqLZpXgcaztQ9+QE 5YCi2NY5rsfI6qzxA/DFtpyDfeSh+PGIjfO0ilZS7W8ICW+DNe1YzS9nYbizQ3LGTgkX Qdhw== 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=etP2h5UOgxyD1g2PWXehDiF8c3xFUHhjjtIkvhRulcs=; b=Ncc8FtDEmtczkF7LBJ4ccl/SfsthJCnS0cP6kwzc+FLWaZzxdNJEa6uqJjfHJphjKz TwEPwNFiKzHO5nMtqgxuGfJLwOoAPJNs5AVvMJSoZgCml9f2F027OntMtt7wUEBsMsx8 hX8O9vduxNnXJwoigDngYK7cXBTfNyKqTmuzHxkpnzYHc1VxS1W71S43+axqA40gEFWM 5/pmP/kXFGNogFlCE070/hI1UeHAHSVc9sm01XKWq5+8SB0pP+aVGBInyzbwH0e9F+Un 4tFJymofDwo/e4scF++O4cyj8lizNzL0ipYVRr9+8VgW6r9gfLmFWtzJcr7G0IRL9z19 Obow== X-Gm-Message-State: AFqh2kpaQwXSc/wd8FqfeWTqy6jx63WlZOvwphABBQJbV0ElXu5rK6yF H3J1yDzofKXA4z91xq2YPbcEcw== X-Received: by 2002:a05:600c:4f48:b0:3d6:8570:1239 with SMTP id m8-20020a05600c4f4800b003d685701239mr1284152wmq.16.1671613452872; Wed, 21 Dec 2022 01:04:12 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id c4-20020a05600c0a4400b003cf75213bb9sm1714567wmq.8.2022.12.21.01.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF3DA1FFB8; Wed, 21 Dec 2022 09:04:11 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal , Mukilan Thiyagarajan , Richard Henderson Subject: [PATCH v2 1/6] configure: Fix check-tcg not executing any tests Date: Wed, 21 Dec 2022 09:04:06 +0000 Message-Id: <20221221090411.1995037-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-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.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 --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 09:04:07 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: 635612 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3399558pvb; Wed, 21 Dec 2022 01:05:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXtXEzlxtPvY5q5i045SaLBlHADZc14wl5D0dNx820XhsCr/8Dr8oCWNzTdCXGH74uhFmxA3 X-Received: by 2002:a05:622a:4cce:b0:3a5:25d4:2f2d with SMTP id fa14-20020a05622a4cce00b003a525d42f2dmr1138485qtb.65.1671613509768; Wed, 21 Dec 2022 01:05:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613509; cv=none; d=google.com; s=arc-20160816; b=z8LYbMi3jsR5c50ovFBZ1V7kVzA139dQpY+N33D7BWzIcQDkNVNgM2wLj3gsJoKsEy F9j3soIO7oQcchDQwxvxqbuVus3yKRN7WVOgHvZzZT14uQuE/rICb2FU6pKm1+7iuoya re0Jf/HxdLSx+6qfEGhuy4zicz3zjF24lN7loAoRD87DGTtvhljMCFrdo0+V1mmtUCBI beJCH7ajj6tM8D3qaO9g0sko9CnfiEemj9mEczHVHzpVAX1SmRX5Yb1yOOfl5Dgk7Lrv hqEIYEiCRXX+w6pHl4aHqDyCLMMFrIKPZzw+MOhyebvR1yqVTXL2Vi3PNEUe+tU2fdys fNfw== 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=uqWW7IL4wGNN919LQfSA7oklF6f1eaV5kpUPVgpB+s4=; b=EydeOZQpNi/42MBePCCKgkHMBWqC4znHCSaJ7gRtO1zhz/TCYIJh/kU6c31Z/IGSSl P9XGGvoz6893W2Bw3sd/74hQfeqhMtvlaDPO4F0vWQFmE4w0aLLydYd2kU//Tpfie4vq xsrjgF8seXP0xdWN/16X3V1yuqkqj8q7hNDkNt+SHOUIpawOCGxjsQQdHUPADeJGerwc qNBdzeV+RBLjDx965b05BzD+xSOBXSr4vh0lB21jtBAiBLRbE4nW7Jirfx9K0RXSxQjB 7ngH0JVFTev9krgXTctjPhhgT+o/SBXopqPLxYFelonm55mQwt0hTG4t3ejQNr15XkDo YG6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oPquq34w; 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 t2-20020a379102000000b006fcaaae59acsi5734114qkd.133.2022.12.21.01.05.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:05:09 -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=oPquq34w; 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 1p7v1a-0000C7-Tb; Wed, 21 Dec 2022 04:04:30 -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 1p7v1O-00006w-5F for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:21 -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 1p7v1L-0000Dx-0X for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:17 -0500 Received: by mail-wr1-x42b.google.com with SMTP id w15so14218399wrl.9 for ; Wed, 21 Dec 2022 01:04:14 -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=uqWW7IL4wGNN919LQfSA7oklF6f1eaV5kpUPVgpB+s4=; b=oPquq34w+TIDl0QlRgne+lpeOiZTxnHCCiY8TtHlW3kPpw5+dGLbKRtAY2N2mI7uCA ZBVceR+SLQaDSqNUEHSOQ0++muRtqzZZpUpsqyHYnO29QSIPbC4+Lq33bb1AZFWfvM9d eil4WbHsGHpyQAxSozG9EoyOljUEWBnFplqDq/Pi4HdD1XLJ7OKCb5mgnA5v3J1d0o51 fzdqTo8uF7pCgbFzYJf+BLyvtnI2XqONZtr9O/ZhpPbDvgegRtalq1LTKaYAm1/AXHA9 RMSmJnuE/srPUEK6Ur/ZhkURb3x3yQxQ79rbDnkw6nbjfo+LK6OkqOeMMqH1Bf/bXNZI BeDQ== 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=uqWW7IL4wGNN919LQfSA7oklF6f1eaV5kpUPVgpB+s4=; b=heB/Nny5cNYt8FppixRaoOvYlC8XHTJNPibqx6l8G4kfEB2xAjbsF9iVo+ojypdsMn ew5dTJlhLiVO6at4C3Y63JnrDnw15XPeQNBCCvxlu4dzGy5aEP/0j0Sbg2Vih+cufzXC RExdZ2aIST95NnNaOw8NC8aKHfczlB9poGT54bpmmVBn/Y/A++AMju61RoaSeSYsWsKC 4af5QhUonSKqB+VIRaXoZMKnq6Yjlh84MeeI80qA9bU5eqdMfJUcJliD70JBoQ/4gWiZ lESXao6+caJfm94sEcX6hcPo+HsyTdrBZSoyuv6iVNXzUMLx+xJMX/C+bokF63ytaQNA 5eJQ== X-Gm-Message-State: AFqh2kr/yQBn3TnFFb8CcuGYPwgV2EZwUaOUuDmw65UIvL42lgwdkUk/ FGOHXM0dvlTe8zMgxoRuQvURKQ== X-Received: by 2002:adf:db11:0:b0:242:6055:dee3 with SMTP id s17-20020adfdb11000000b002426055dee3mr513874wri.63.1671613453618; Wed, 21 Dec 2022 01:04:13 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t6-20020a5d4606000000b0022cc0a2cbecsm14542330wrq.15.2022.12.21.01.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:12 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 16D171FFBA; Wed, 21 Dec 2022 09:04:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal Subject: [PATCH v2 2/6] gitlab: turn off verbose logging for make check on custom runners Date: Wed, 21 Dec 2022 09:04:07 +0000 Message-Id: <20221221090411.1995037-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-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 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: <20221215144035.2364830-1-alex.bennee@linaro.org> --- .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 12 ++++++------ .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) 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 09:04:08 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: 635616 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3400105pvb; Wed, 21 Dec 2022 01:06:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXvqJzGVAZ/CHmQBFTrtUYJ9NrXvUXmio/ylG3qY14AD+tTB5OeXpc5Te9ooZwie8MShJaDg X-Received: by 2002:ac8:764f:0:b0:3a8:494:2cbc with SMTP id i15-20020ac8764f000000b003a804942cbcmr946248qtr.20.1671613583934; Wed, 21 Dec 2022 01:06:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613583; cv=none; d=google.com; s=arc-20160816; b=U4mWYH/FalegawFNR0jMawhkeYZ+p9ETw2ao9imaPNPrQfzWYuaG+YpW46miMTO4CO T2r066Btbh/6UvFI/K/suRbf/UDW8iamZSlcY8RKnKl1oJZm9hRETYN2Wa8FVQAgYzh7 TcmjCQJ6UqOcEka95kWLD7t+9kfJ651ZKGLvogNheXcvnjdqYhWlcX2159ntA3Q3fSBy 28kBRK5GdUHqKsMYuGZaih7bc35q06yBRtlNbgkBDMxjvgwfzv84KmLlsrJjtlLNEz4i lTJ65RXOimTJjBpjyRgrBE+uvUSAEl+wdrf+wifm87OHbJ2DINqumGZO8zs405Rhe/gd +AlQ== 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=7gzfip+VtarrKCNhyN3EQVuk1lZMb8d8K27dCXSbGMI=; b=WxqceS1CCe2Q5qOjJG1L77+pxoF2WvezvfnViTuY5iDdqmPUZlOVgtvtmbIJ7aDTLq oG7hZ/QHeb6jphtwD9o22yStb9DlbaW2T56Sivk7L/rk47njPnZ6ViJVsWU56spjV5Pb Ajn2V2tqDtRQxEiKepFhQkA5MvGchw4OSinG24R38ijAJHIKCat0Rkpe8ty9D+LJj3v6 G4edOmqPOTGYZDdOVvlpIGuIQ0HR0DaoXmSfGqgryC0tflFpEKDpD1cfWpOL6aTAun0u MUA4k7v4JOC3mNYTQuLSdbs3oN76Mnk7J+GE9CY1jRVaIlxUpKTmaYdDn1VVkWCS/xrq GeVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=tJtOzEbV; 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 y10-20020ac8708a000000b003a7ed20b129si5898245qto.287.2022.12.21.01.06.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:06:23 -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=tJtOzEbV; 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 1p7v1b-0000CJ-Aj; Wed, 21 Dec 2022 04:04:31 -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 1p7v1O-000076-DY for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:22 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7v1M-0000ER-OV for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:18 -0500 Received: by mail-wm1-x329.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso941706wmo.1 for ; Wed, 21 Dec 2022 01:04:16 -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=7gzfip+VtarrKCNhyN3EQVuk1lZMb8d8K27dCXSbGMI=; b=tJtOzEbVXWhuM2xA31Q0yrL5/+ey6fq8UCEPmhFpUF7O99EktAR8MfqFrHvHnHoJvO HxkR53wUivHjMZAO0ENoxDPOOluFot9w1o8b8hY5dihSeuZcmEO9THoavQEfD70qcMVP roGKbGFII7h8vTqaclM4UrmjAxLTTMD4Df5QpFzxRxH1mnTJYC6PIMz4yb9hVtN75u/k XHQDHaV17S/AY97YIIkk60ZZqUBattXfvbzw8htGOzS81l5L1AxTqGFTbx5WdCVTkvOe XZrrwTWtODXr6w5vSHF+/djEe2QNGwdQLu7HxDN2as2p/uY3Sg/vr5MCI+9YiBT2FwOO CiLQ== 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=7gzfip+VtarrKCNhyN3EQVuk1lZMb8d8K27dCXSbGMI=; b=4UlfBrWJ24xvIT7t2A+yqdf/Dfh1gaeY6+0qG401KV6eOpS3xcfOW+GE2aQHyOMHuX 0Y0QLphhpLN6KTl5BbJwmJmXPPCG8BOaNGxytWsQOKJkrUroWSeXseagKofvacDqz+y5 YDSqcJnEmkgJEjXZyd7NRxZb++QCM43YEC+6hD9W4D9MikjoWcOoYV7gJ4wXqv6Tolta Pbkqr3DQ1CGG78HlVXabWqi7MJGa9zroj4yiC3M7wD1gkWC341FkILFADdgl2OnJGyhQ /qk9Phndfv5IQJIVC/n9Z1NmC2BPjRmqxuZfpas6xHr2FQUt/wGn4WtwrvNQuSICINih rT6w== X-Gm-Message-State: AFqh2koRY5yyoVQbo9x6Zexz2VSfNGldidkv+UjMKKacARq8ZDKH5smM AtFf3iZ4HrdlMFxFan5Hx23XZA== X-Received: by 2002:a7b:ce89:0:b0:3d2:3239:2fd7 with SMTP id q9-20020a7bce89000000b003d232392fd7mr973437wmj.41.1671613454407; Wed, 21 Dec 2022 01:04:14 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g12-20020a5d698c000000b00241c6729c2bsm14720103wru.26.2022.12.21.01.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2C7201FFBB; Wed, 21 Dec 2022 09:04:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal Subject: [PATCH v2 3/6] configure: repeat ourselves for the benefit of CI Date: Wed, 21 Dec 2022 09:04:08 +0000 Message-Id: <20221221090411.1995037-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.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 Message-Id: <20221202174746.1218017-1-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- v2 - only add the extra line on GITLAB_CI --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 09:04:09 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: 635614 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3399920pvb; Wed, 21 Dec 2022 01:05:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXuaZwU48jQY4A80/RPL13LN5TbtkKiAEwruUYDMMuBU9nN56nylbwWNpq2IkhUOsnTOxRIi X-Received: by 2002:a0c:e6c2:0:b0:4d7:45fb:f5ac with SMTP id l2-20020a0ce6c2000000b004d745fbf5acmr1308411qvn.23.1671613558120; Wed, 21 Dec 2022 01:05:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613558; cv=none; d=google.com; s=arc-20160816; b=Pxnjsb6XVpBwufFfLoHo2GbMtcUH9XvFlKkmT8imjPzh/65T/QC69rcKXXlYrWYuos +KJPeHch9mFGyKHUDvJopjOXL/g9wRtA/+wJTgIhXjA0mdkM6di6NyaPLJZ/mvAQ2QaI aCPFFu6zNAMmbJwOJpD08te0rkqFnqsKdLCAunUmVKNF/4AH/zXOkyvFO+smK39RJQUU cfBp47PWaoUNTinhia7VwX+vjmvlTHa+Z99iuiqhl1jXFf5fhHxAambV4QFEDF4MA+Q/ HGQNiT5iDRfHOzOGZ77/RBGUmJ5a6jNY1+Y9K+h+dNlw2FtjW8+LPG3wfsyG7JCOaoCr FYmg== 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=zn8RE9bkGb5wvE/Wo/L+tyIK7nNLQkZXvyqS6ZelWWU=; b=qMpemWvfIr5Qd2UUpFjNUpzh+2AEfYNK9Hy6FHUcle53tOqFs4JHdwjjc1cmTYci81 x691/Rpmx+i5sey70cDtzswBVbHJDaukUlXg5CRCJwGKefdENO6y1WSg4flNKSDvd55T /laF95zfDeiyNmQ81SW4yczX3LQh7dcbFhPKTIqCjdWwnr5ysMb7ZTtWk9ufy+jfrUo5 66amvoFCDW6KdxzcFdW9qAYtkTBbF4maW3nb26qI/1MWt4fZnak2LUNTIrdCKkEQGRVi 74Qr25/KYxQOIVD1UaKJe1zsMH4/UPsPiaCbFo/e1yVAj938xY/hkbx+jdmW2VMhNN2N 9UJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=czyvMP9g; 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 gw10-20020a0562140f0a00b004c6adf76c02si6278107qvb.370.2022.12.21.01.05.58 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:05:58 -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=czyvMP9g; 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 1p7v1U-00008y-Co; Wed, 21 Dec 2022 04:04:24 -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 1p7v1N-00006p-Py for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:17 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7v1M-0000F2-0l for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:17 -0500 Received: by mail-wr1-x42d.google.com with SMTP id h7so14239231wrs.6 for ; Wed, 21 Dec 2022 01:04:15 -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=zn8RE9bkGb5wvE/Wo/L+tyIK7nNLQkZXvyqS6ZelWWU=; b=czyvMP9gAypZgYJcWCiUyA6/8cCj2u8scAP6hZ/Ehrz0LD81NVpiGkybs7SJZbx2nH 3caOfX+QM4IKzk1F88dYmwlweAN8e7Lofx1DGsVKPL8QMgd+xpjsm+cY/WizhDLl2vsY dq4gSft8XsIltnwGsT2Yp0C1/XO+wCl7LL1YJv6fkTajJUKE0vB4KMmoyc6sHAQeBb1c 4i4Ae+mn/2WV5TBPc4qIOHPykCy/bM+Juqav6xWhtuDi4zuji+zeBLV9Zcp3zvQzOwQF qf3T/ymKsYeq9VuN0CJ5s5e1iKStjO5/SufmyYJF7vk7IZM7oO/7iio8atdLdIch0zqD hUPg== 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=zn8RE9bkGb5wvE/Wo/L+tyIK7nNLQkZXvyqS6ZelWWU=; b=msiVeJcPZI3/vy1USpIdEPNYNa3u6ZJw/VxmgRA24Cn9n3mSvaSVQmMUH4AY8CS1Ee gryLhUU5j06ZREapc5nWloORPYkL4akA1WYz9cjtq6Orpi9zKH03CeVLjOo9MvBTE145 WzzWPFVGfm7TY/e2SvnyU6r35CYjci1kVAEcaeh0Znep7+1kn7PSNZx6h4VWn74QTpLs yjHXFGQ87nsPc8QdIVFuTv/RDJDr6/O3htuEyRomUEuewzRCbwFf/NfpYEcQTXLWbH8p HpMXCDj4hddH0qClpM5ffmXz5+XGVHSBR2WVhQDSPzZv5AHOnf0wywG2tC5y0M/dcj+I qC3g== X-Gm-Message-State: AFqh2kpzokI9zkc6uRYEXZ0ANQ+EuMkVj/uP5mGYN90rwgdtV7rPfNxm 1SppqJTm7VWH7TETvCbUq2/zXw== X-Received: by 2002:adf:e383:0:b0:242:3cb6:36b8 with SMTP id e3-20020adfe383000000b002423cb636b8mr651289wrm.44.1671613454690; Wed, 21 Dec 2022 01:04:14 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id y18-20020a5d4ad2000000b002365cd93d05sm14829885wrs.102.2022.12.21.01.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 430851FFBC; Wed, 21 Dec 2022 09:04:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal Subject: [PATCH v2 4/6] tests/tcg: fix unused variable in linux-test Date: Wed, 21 Dec 2022 09:04:09 +0000 Message-Id: <20221221090411.1995037-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.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é --- tests/tcg/multiarch/linux/linux-test.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 09:04:10 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: 635615 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3400030pvb; Wed, 21 Dec 2022 01:06:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXsNHBqnBYB/aRw79B3CpDLH4m5bngNpnT4NO2z0I0ojNUnTFCplazDvUhQnoYNAdSCCC9Q6 X-Received: by 2002:a05:622a:244c:b0:3a8:e9e:e194 with SMTP id bl12-20020a05622a244c00b003a80e9ee194mr1105885qtb.40.1671613574351; Wed, 21 Dec 2022 01:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613574; cv=none; d=google.com; s=arc-20160816; b=Vu7n4gXDSi273hWUM8DsAZzXDWdBYqppfofrLvpMCTItztQG6/eUH62WqUNlRlZHOX wGcb2koLlEuBWoJG/LarC6S2BWhFNfymXHQG5n3JTPsnJyIdNfRQ1grtTYgOtG+mqQ/B DwhWi0ik9heuaZzi/Vjmy8H0TSDSRGUmgThemYHh0R4hpZRdL5qD1jAZoo/G6EQlPLCg gsMQlPIqu+BVJj7wNLRgs4Y2QCp+OZDhiDwOtDWMW/EfHIN2osoebiL3s6MLWGPtCNLJ 5apZI7UtdBkV6MNXLjQcnpJsNXsns0uKedNhTjYy1fsNRzB8GqFrt1cAb50j0+Q2nlXW KtCA== 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=jSgcOKzfMlu/kSupvx1vHgH6RK/e2Urq97zQ5/WEL0k=; b=J+HsTZgOvqg/y/I+wuDfgEAG0p4/03bd2eF17YMgOelTC64DNccGEBkBQqvsSuQXdA Z7eMYkt5sEH+hZAF/lA4YWqPYCCp+sv2sy5NZ7SrQ+mvDf1q2kKt2jB31NHCdEJfsRdj I9V8CpcjB+1tl8fCYPwO5J2PPfJmtVI49Mo/osg86CaKgezDeSWU/js6I9odItlJMgug o5xvGcDGZuPAvGr7JxEJzbvDyF6Dd5uHV1jfXYOOE8auRdh71s1k/mahD0MmRQaNN4mC pM6+/v2fXvq0YzvItn8cpGGu6C1bL35sW7DrmMaerTRij96Fuw1ntsbdjAiYeheCIECi BQFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GWTUGpuF; 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 h5-20020ac85485000000b003a6a1fa6b39si6017627qtq.548.2022.12.21.01.06.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:06: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=GWTUGpuF; 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 1p7v1V-00009b-64; Wed, 21 Dec 2022 04:04:25 -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 1p7v1R-00007F-Be for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:22 -0500 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7v1O-0000HJ-QE for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:21 -0500 Received: by mail-wm1-x332.google.com with SMTP id i187-20020a1c3bc4000000b003d1e906ca23so1002693wma.3 for ; Wed, 21 Dec 2022 01:04:17 -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=jSgcOKzfMlu/kSupvx1vHgH6RK/e2Urq97zQ5/WEL0k=; b=GWTUGpuFsgGjA8RDhQn3xB/jIsQ4+wOy+uRB4WYt6a1OELfm8tURQ17ko+uamFz5OR KtFu2YBG/bvEzfdz/hx1q366NjKstoMiFi4AZCd7Wm7llivS99w49PFjrjuIWk1PTNN8 N8G80NewMyav+HJW5FZZ232jBGvA3fNDzsj02bNIY4nMZGFMxNDiXd/F1+VpldJ6Iq00 7iK2uCKpcuEBPvVrmdyv7b0IZzJEkS8ipDc7ooYys09TpiBB6rmnkSp2CRKNcPF492eI 6d9dtv8MuqyGIRIMbgTqoDsutALp44+jA3NVFfdMysKeQL0pde7wxyDR9wikYStjFSRx BKdQ== 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=jSgcOKzfMlu/kSupvx1vHgH6RK/e2Urq97zQ5/WEL0k=; b=mS5tmQQ7MEfcMSwZ5XaEAHtiXPSiRQbH0f0TiZMXF0Qf97BnwvR4Dqg/BHakC41Rm+ BOgULrVfIQt+7cC1ftoEby1BX33ZKrghbm8o/BdR3vOSfl+LYqa+kRVBLpZTkFMOzY0D Iew7FFxY0w+TI0iCocUlUfODUmMbPMi7G1Mfsj+cG6L46ZEGTczGJUVpXyn54ZR9Hd0z d3xCmC2dsiJALtRpmqRnEhL2MgeSnkTw12C5T/EPMLEwDCEYuup7tshza6M5vOgQjf3+ thJMkgqwuLE/87fJMU//B3LJS8t5qpKtggYKkJ8VW3pGpbkxBPOvrUoO7xsJfZs2Lbi0 e5VQ== X-Gm-Message-State: AFqh2kqESGPCztNzNUKMQX0xCywniEnVg3E3WmixOv4VnNB4Z8B9yqoM UnosVJCKZpctrRq26ROBCGdQBw== X-Received: by 2002:a05:600c:4e48:b0:3cf:5d41:b748 with SMTP id e8-20020a05600c4e4800b003cf5d41b748mr3773338wmq.36.1671613456331; Wed, 21 Dec 2022 01:04:16 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s4-20020a05600c384400b003c6bd12ac27sm1382295wmr.37.2022.12.21.01.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 687EA1FFBD; Wed, 21 Dec 2022 09:04:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal , Mukilan Thiyagarajan Subject: [PATCH v2 5/6] tests/docker: use prebuilt toolchain for debian-hexagon-cross Date: Wed, 21 Dec 2022 09:04:10 +0000 Message-Id: <20221221090411.1995037-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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/ Based-on: <20221215095820.13374-1-quic._5Fmthiyaga@quicinc.com> tests/tcg/multiarch: remove unused variable in linux-test Signed-off-by: Mukilan Thiyagarajan [AJB: also tweak MAINTAINERS] Signed-off-by: Alex Bennée Message-Id: <20221219144354.11659-1-quic_mthiyaga@quicinc.com> --- .gitlab-ci.d/buildtest.yml | 4 - .gitlab-ci.d/container-cross.yml | 19 +-- MAINTAINERS | 1 - tests/docker/Makefile.include | 4 - .../debian-hexagon-cross.d/build-toolchain.sh | 141 ------------------ .../dockerfiles/debian-hexagon-cross.docker | 53 +++---- 6 files changed, 20 insertions(+), 202 deletions(-) delete mode 100755 tests/docker/dockerfiles/debian-hexagon-cross.d/build-toolchain.sh 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 09:04:11 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: 635611 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp3399557pvb; Wed, 21 Dec 2022 01:05:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXvP7AcgmAPfL/d4hcwKHMVCP4SGzZQCW4kd7qVuRJrgh1B5JccFALP31eW8RXS5ymRoSP7G X-Received: by 2002:ac8:4a82:0:b0:3a5:74e5:8b81 with SMTP id l2-20020ac84a82000000b003a574e58b81mr7597761qtq.21.1671613509646; Wed, 21 Dec 2022 01:05:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671613509; cv=none; d=google.com; s=arc-20160816; b=TEhfu1/WqSZ0epkd3bhUANzsBOp1Q//rLiaBhYqj32tphuKuFHfjTz9ui0SwnCh76/ SMQRQ5iBJFOgtzEkCZ2ysTwBCFcw0sMUGrHh9IMsCZe4yJfrRA89IqgKlxROwgXePZNC 6nMfL+c6cygvjGSYTzMkm9oliuU+w8Mqg3n79VTlW4UeGVnI9YGBhezoLvx8Ju9FFttp 9kjGq6JT8EQk/z1NPZvc+Bn42O8NlJb6fO0stGFLArzFOUeU31ArWwW0nbg/ivZVhFAH lXBmwNP0FEowtBqajk212IrCbVetG9lZsM/v3lGcoB/c+RIuU6RPI/Hk3BgxolGeBJh9 oDJw== 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=9IrJ9O1ktrVQ17dyt5OElAaiWaC6DDZGAyzE9vW9dtc=; b=la2I38T6/atTe5ukKRe3cMbSq0DwAO+nPvKIi3SDOohXSJDtASAo+elXFVZJl8I4CL iJlwFjZdoAr4SSc1TJPoQ6e5qsCluzwSrheKvSjkUUy7zy3vUSQ8Jw9hfTqPu+l4msGh sZ+zz+f92VfzwBU0MT8dmTMQEh6X9pAaBvhJcjqed/BSh5dOekD7HFnychf+P1birAX8 NVsYQ3rcw3ztVJsJGJeO+RmsZuBfcxehOE6+z9Rd6XTq0E7jpZNs70p9punrEdIggfiS MKN5iSAihvqz9bDpRk5egcPnULLMXd/F6EuCbeGX4BXhetgQTUrwRMvqzBDBHK7+nJ+L S8RA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dfwve8NQ; 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 do54-20020a05620a2b3600b006eee7be528esi6068763qkb.561.2022.12.21.01.05.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Dec 2022 01:05:09 -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=dfwve8NQ; 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 1p7v1Z-0000BW-Uy; Wed, 21 Dec 2022 04:04:30 -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 1p7v1P-00007D-7y for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:22 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p7v1N-0000Fy-Hd for qemu-devel@nongnu.org; Wed, 21 Dec 2022 04:04:18 -0500 Received: by mail-wr1-x42e.google.com with SMTP id bx10so14289265wrb.0 for ; Wed, 21 Dec 2022 01:04:16 -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=9IrJ9O1ktrVQ17dyt5OElAaiWaC6DDZGAyzE9vW9dtc=; b=dfwve8NQYRsFccrWVlOXszZLBBpIoMTqBEKCSnIV1MWNfenrcGqrJHkLKEY85SoQGQ 0MCGySILCNlBOl+g+l1mZoTQEIqFXxid07DYPKHKen3zD2+bOHNc0wIt7vhxL/g6Zz/z RNcQd4eU1pxqgjmAiJot5drl1KWoVMwxbMBbEuPhUkAC9/sfyaUUIPiR4ZIqLv/x2i2i NP8PqWavyzHcNRWSNOtM+dXwXGuNEmISbWFD/KhKgNwyfQftOTtiSR3ggaXxtXN00lKM 6IB8HlSZtcEsW4NQq35yfmlX/kbfGm2fNFfzp9VEfClHWTuMQy3Mt7ylouWPLLJesr5R pTyQ== 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=9IrJ9O1ktrVQ17dyt5OElAaiWaC6DDZGAyzE9vW9dtc=; b=CD0EszSSXaz2qm/jAKh/+NvfyU19/Jaz1vwOVSFSqvNKKk1fBYse0bav6OtrNeGVLH /iA9UJ1KUsTzYtkit4qcS8yYbAlw0SfaxasV3Y2yaiVxSvHP76QoUBmhlzgSAYD41XeS p4kY0xi01vd5je9gC45ZDdYwy4byjoMf/Nq2Nu/+Sh5LzB2M3dkznzn7U0UWwq8hHY/x 8+66JNhRJMzpZ3uqoo33DkzONVr0uLMxRtIiuJukP4m4qWmMBHT4VkH/ClwgZlhTQ+oy 6oEdvq94eu4vDLQMNLZb5ZyaclRCgandC49B+Ua8r/QrAItiXvYRuy9PANQ4B3pPFyNa DORQ== X-Gm-Message-State: AFqh2koDfoZgMt+bJHPU8udmD62VCJOYxBKLr6vQBvpGoavsgeahcDp8 0YUFjszhZw74/OuALmUmgGWDcA== X-Received: by 2002:a5d:5c0d:0:b0:242:1809:7e13 with SMTP id cc13-20020a5d5c0d000000b0024218097e13mr3693182wrb.11.1671613455542; Wed, 21 Dec 2022 01:04:15 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e15-20020a5d65cf000000b00241d21d4652sm14845396wrw.21.2022.12.21.01.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Dec 2022 01:04:13 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EFB81FFBE; Wed, 21 Dec 2022 09:04:12 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Beraldo Leal Subject: [PATCH v2 6/6] gitlab-ci: Disable docs and GUIs for the build-tci and build-tcg-disabled jobs Date: Wed, 21 Dec 2022 09:04:11 +0000 Message-Id: <20221221090411.1995037-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221090411.1995037-1-alex.bennee@linaro.org> References: <20221221090411.1995037-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=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é --- .gitlab-ci.d/buildtest.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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