From patchwork Tue Feb 21 09:45:45 2023 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: 655358 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1868823wrc; Tue, 21 Feb 2023 01:47:09 -0800 (PST) X-Google-Smtp-Source: AK7set/Q5g6mOupC+SzAwfo8zPURfj/GFbUzeB2tWHnIHmPObBylkH/kWvPaCB8l9ts1eGyCtxMr X-Received: by 2002:ad4:5d65:0:b0:537:4b09:670f with SMTP id fn5-20020ad45d65000000b005374b09670fmr8727135qvb.25.1676972829361; Tue, 21 Feb 2023 01:47:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972829; cv=none; d=google.com; s=arc-20160816; b=zoFFlXidtgkmi9Krd5ME1nFP8H9qspBONN22YWEd8IYnhsoqJLugwVWbvqeqt2H/1L jLWgeUC4RKCQUPO689Q73Z93nmMQTX6NHG5p5kL0VegjZI1dadweiK9oWH7NVZHhHQEK 8+8vtQDni36M4cq4e/oFpE01d57Q92lJxjPYuIWj+43m1ycNkSdkqnNyZNyx749qj7DK n1VmGQ4DEvXrjMsPM4SQdpfurPGxczyOlN9zkOroRN4/aaqVaM9QRPAXkifzQe01Hvue YdL8nW6BlzehsuTcIOYU4EAc6uvCfdrADf9toLqSpiLQ5hW+yj5Ny7QgLBqZJnDNSimG zOfw== 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=2E4fiXlJ7CJ9nfjz2dqu3lzDAw7M+EYkDKHTbulwIxo=; b=H1lAon0bDtbiFBoAeHl9RHxi3HPgZFVBG72Uh8PeBaOiZATTWGqzRZs2ogR+IQ552Z i+vVWdcs/LKx8/tDljWIhKaDAOWQy6HpW8W2qCJX1KjqYZnhlLDp3amiwknstDSvLb1i rW9sCvjQ1LcqCOSbJrmN4dTUR1t+L46YyuNjFoCuJ3rnRKfIh0pNll0cDNTYn+z6M4WG rRTdcZS+CKMC79bgfpUme2OfUrdnl2i0/4axGim4PLYsIyf9byrnK2dl4M2TgoNb91Fe 7tFPCzdbvvumHlGvM/+iJ2oIbAm2wHmk/CFyfEu4lvefRdT63kItEYaiCPDq7+Z24HKA wp2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KHnk+ORn; 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 l9-20020a0ce509000000b005347cdcbb80si2548025qvm.239.2023.02.21.01.47.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47: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=KHnk+ORn; 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 1pUPE1-0006eG-Bx; Tue, 21 Feb 2023 04:46:17 -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 1pUPDo-0006XH-4v for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:04 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDl-0005gz-E7 for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:03 -0500 Received: by mail-wm1-x330.google.com with SMTP id l2-20020a05600c1d0200b003e1f6dff952so3005043wms.1 for ; Tue, 21 Feb 2023 01:46:00 -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=2E4fiXlJ7CJ9nfjz2dqu3lzDAw7M+EYkDKHTbulwIxo=; b=KHnk+ORnE464Egflg7HSTtBv2mD626isu0cKO+aCg1o6gnAowryzZVJATKoubrUxMe AQgver8oGlJJfapgqFdldbYOOeBvK5lTU7tKUNcsADcBZ7cjqyySdAYqkQpMsCLzyPXc U89Vl7w8Ay9jyRdP2hShQE1Geao4RtCpq6ZcKaXKYLQxXw5fet56XlJDgzOcP0Kud14e BMPdgTT8316WgZzeAZEi7/gfj8rR7H4ldDarx5R3Ii+nQsfL6lgBCD251u8PxQLeZa+C m38AmVIB0/fZG71TTWLOQwACZrZtT0iqaCrakWLSTV1Tx/PU145IAWFD9ws5SHSIbQvI rBiQ== 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=2E4fiXlJ7CJ9nfjz2dqu3lzDAw7M+EYkDKHTbulwIxo=; b=rwtMlvT7Tc5dYRRHG+Wc2UwjSTejhqOTlReZQxjKFPGnHq3Ji0ExGIYVMoO4R6hD/b 69w038smhCzETv+u2cv6NjG+yIFVBRHeq7TqY0ZHYYm+Cul4hKWhK+d11olWvWFfKLLM ffE4UXok4e56LthiNuUZe/cwrJk0+N4lP9wOX8IkVsjbxsyMBYazALDMGHl+4jweNf43 njhNTIngDfWIRUU7s2ToCvGrs+NTeRA6VOK+oGvXYurrVUf4wPuqtrY/sKSTriM+IDui YEnoN565aXXqlwSH/69QcSaM5ld9bzcSfOKNiUWHNiHRQU3kfSNfDsVU5QdgKjedjuPS wy0A== X-Gm-Message-State: AO0yUKXe1Ss6O3ia9yfPrCOw/Bk45QUEkPTol2M5pib9wsiZYOMcSdnU encxuOxPNfenGkaRgXje1tsqVg== X-Received: by 2002:a05:600c:994:b0:3e2:152d:894e with SMTP id w20-20020a05600c099400b003e2152d894emr3012017wmp.15.1676972759935; Tue, 21 Feb 2023 01:45:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v9-20020a05600c444900b003e21f01c426sm3194687wmn.9.2023.02.21.01.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:45:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 037621FFB8; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= , Anton Johansson Subject: [PATCH v2 01/14] block: Handle curl 7.55.0, 7.85.0 version changes Date: Tue, 21 Feb 2023 09:45:45 +0000 Message-Id: <20230221094558.2864616-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x330.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: Anton Johansson * 7.55.0 deprecates CURLINFO_CONTENT_LENGTH_DOWNLOAD in favour of a *_T version, which returns curl_off_t instead of a double. * 7.85.0 deprecates CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS in favour of *_STR variants, specifying the desired protocols via a string. Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230123201431.23118-1-anjo@rev.ng> [AJB: fixed author] Signed-off-by: Alex Bennée --- block/curl.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/block/curl.c b/block/curl.c index cbada22e9e..8efd97b349 100644 --- a/block/curl.c +++ b/block/curl.c @@ -38,8 +38,15 @@ // #define DEBUG_VERBOSE +/* CURL 7.85.0 switches to a string based API for specifying + * the desired protocols. + */ +#if LIBCURL_VERSION_NUM >= 0x075500 +#define PROTOCOLS "HTTP,HTTPS,FTP,FTPS" +#else #define PROTOCOLS (CURLPROTO_HTTP | CURLPROTO_HTTPS | \ CURLPROTO_FTP | CURLPROTO_FTPS) +#endif #define CURL_NUM_STATES 8 #define CURL_NUM_ACB 8 @@ -510,9 +517,18 @@ static int curl_init_state(BDRVCURLState *s, CURLState *state) * obscure protocols. For example, do not allow POP3/SMTP/IMAP see * CVE-2013-0249. * - * Restricting protocols is only supported from 7.19.4 upwards. + * Restricting protocols is only supported from 7.19.4 upwards. Note: + * version 7.85.0 deprecates CURLOPT_*PROTOCOLS in favour of a string + * based CURLOPT_*PROTOCOLS_STR API. */ -#if LIBCURL_VERSION_NUM >= 0x071304 +#if LIBCURL_VERSION_NUM >= 0x075500 + if (curl_easy_setopt(state->curl, + CURLOPT_PROTOCOLS_STR, PROTOCOLS) || + curl_easy_setopt(state->curl, + CURLOPT_REDIR_PROTOCOLS_STR, PROTOCOLS)) { + goto err; + } +#elif LIBCURL_VERSION_NUM >= 0x071304 if (curl_easy_setopt(state->curl, CURLOPT_PROTOCOLS, PROTOCOLS) || curl_easy_setopt(state->curl, CURLOPT_REDIR_PROTOCOLS, PROTOCOLS)) { goto err; @@ -670,7 +686,12 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, const char *file; const char *cookie; const char *cookie_secret; - double d; + /* CURL >= 7.55.0 uses curl_off_t for content length instead of a double */ +#if LIBCURL_VERSION_NUM >= 0x073700 + curl_off_t cl; +#else + double cl; +#endif const char *secretid; const char *protocol_delimiter; int ret; @@ -797,27 +818,36 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, } if (curl_easy_perform(state->curl)) goto out; - if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) { + /* CURL 7.55.0 deprecates CURLINFO_CONTENT_LENGTH_DOWNLOAD in favour of + * the *_T version which returns a more sensible type for content length. + */ +#if LIBCURL_VERSION_NUM >= 0x073700 + if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &cl)) { + goto out; + } +#else + if (curl_easy_getinfo(state->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &cl)) { goto out; } +#endif /* Prior CURL 7.19.4 return value of 0 could mean that the file size is not * know or the size is zero. From 7.19.4 CURL returns -1 if size is not * known and zero if it is really zero-length file. */ #if LIBCURL_VERSION_NUM >= 0x071304 - if (d < 0) { + if (cl < 0) { pstrcpy(state->errmsg, CURL_ERROR_SIZE, "Server didn't report file size."); goto out; } #else - if (d <= 0) { + if (cl <= 0) { pstrcpy(state->errmsg, CURL_ERROR_SIZE, "Unknown file size or zero-length file."); goto out; } #endif - s->len = d; + s->len = cl; if ((!strncasecmp(s->url, "http://", strlen("http://")) || !strncasecmp(s->url, "https://", strlen("https://"))) From patchwork Tue Feb 21 09:45:46 2023 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: 655370 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1870162wrc; Tue, 21 Feb 2023 01:51:19 -0800 (PST) X-Google-Smtp-Source: AK7set9Q6aCrkek0kWTme84atn1US+sEOF6Z+kkiYmYKgSsLSHK+6XtVfbZOi0nrpvXXFyICLYnj X-Received: by 2002:a05:622a:453:b0:3b9:bd28:bb6c with SMTP id o19-20020a05622a045300b003b9bd28bb6cmr22506632qtx.36.1676973079326; Tue, 21 Feb 2023 01:51:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676973079; cv=none; d=google.com; s=arc-20160816; b=FpNNV8Gao6bkCSXnft6dVpXGsbrXiSxCGJE2zhlSfIXYVYiAQ7vM4WP1iH13JZaV+K evAYe37KHPe/ZAkwyIF/KLDbmknM3hDt2z3kWiqStl3UvIMLfazsBUfA4/iKf4JpK2V0 kH5LOcd8VxKqZT01Sn+UEa1wi6MzBHbauWgJA3l3LvDeo4kc/g9egZA04j0SzhO6qDXr VbGOk6C+0ruyheiicgUfnCATbTbv5oasZnbU4jaOQEtI8e35LcBIRs86Kse6N9NKE1c1 Ttv9E6+uvYz+bb1GNuPn79JMCW5Wgpet9W8e+fz2sTkp6OxJJbtMgbyz6AnDgOaxi0n0 O5+Q== 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=KhqJDF19zs5rfm3N2MBvoePdiOYf5ocnGb+1ca8BnR0=; b=zyB07U9Hq4NRr76+bKXjonW/46Y73ZD0/NIRSbgozkNSkP7JEsUKwWD0WQ97KpYAJ+ DO1NniFsk18vuInA/bgU8O6JQmDmRpJDVXVcQslQRK6NEG+CF5Qg0JlhSqwBG+eXZf9p WVLlsVVKiTjWIgI7kQrgRIs5bDIV/EdHIRxvN4gKDt3PL7MqqGwPlwGBnWUqBYICfBet 2S1d7qOS4LS+WMakW6MuRAUw4MtqgjRWwssoTkTq2Wkyffy11P+/RwZu81vh7O4Z8z4O KKPNwDWH5PUVbWJ3vTcTBL8oJlpGa8W/JmIOoPYmbHBjNm5XuqsGwyYJOLNGRMS6yek3 4wzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EU3yyO+u; 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 dt21-20020a05620a479500b0073b3a3c109bsi11686788qkb.62.2023.02.21.01.51.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:51: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=EU3yyO+u; 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 1pUPE5-0006hq-Gu; Tue, 21 Feb 2023 04:46:21 -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 1pUPDp-0006Y2-RI for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:08 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDm-0005hU-BY for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:05 -0500 Received: by mail-wm1-x333.google.com with SMTP id l2-20020a05600c1d0200b003e1f6dff952so3005086wms.1 for ; Tue, 21 Feb 2023 01:46:01 -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=KhqJDF19zs5rfm3N2MBvoePdiOYf5ocnGb+1ca8BnR0=; b=EU3yyO+uv9X9FwaQs8hmvSvw5flyTJ/tSPQzLLda3MghNuF90YxGImHaayMYxdrf0g QJEWsb0VQljiuc+Axu7MA8l3hHk83G9EoknH5TZIuf7aSAWukohGedkv/8Mv/OnnEeBt J9skTViwCw79C0P87l51fpVdzCKElX5ppG5b+dVHelv/NZXw8rU+ZvVMOy+ZZmi7R+8t BeednGBpdhTBgUsS5RtdnWSx98V2WAJi9lyeOUloTn+9qusl0EYM0FuZf/kzF+YfhhoR pgaH8OyZ8/Hjp4yJHhb3Ac1Czwayw34K0xWngdU2qj70laSIp6de5l2vZg2NST1BCKor PJBA== 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=KhqJDF19zs5rfm3N2MBvoePdiOYf5ocnGb+1ca8BnR0=; b=q9wVPJIXRhhnhv6q+5q6UiIKGb691hAf6Cn77J6/gjG1ctPk/Y1jbcqSEJrWDAbJLO cG7hnqPk8US3+isBqifbFG06d2LsCGqdL7c9emaTuipb4C3RHlyIqPs+4Bvs98K2afij dMad25XQAcnDZSWV934iRNRRqkLgyiH7YTRonMkmXMRyJzG59brPpdkRBqLok9BDLSJL Wku9p9rLim8BMUgc+Os56k+JICn4ssNDV6dhNET2FOgY8lkC2cFmqaCE0bPZhUrGz2tR f25xD6jhHCwKlUezHKFxYAbqDDCUsX/YOWfpZKwICtLVhYRWpAaj1Zv1qaVVMR6Kz61A hIUA== X-Gm-Message-State: AO0yUKWetOKth7iIQggsZMEWJWW2c6lcpYaUw3P3GNshyAMqdnuCFUaf eF7TDhQlTs925mhZ+yAitGoimw== X-Received: by 2002:a05:600c:929:b0:3e2:5c3:bcfc with SMTP id m41-20020a05600c092900b003e205c3bcfcmr2487532wmp.18.1676972760845; Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a22-20020a05600c225600b003e2058a7109sm4446078wmm.14.2023.02.21.01.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:45:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1BE8A1FFBA; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 02/14] tests: don't run socat tests on MacOS as well Date: Tue, 21 Feb 2023 09:45:46 +0000 Message-Id: <20230221094558.2864616-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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 In preparation for the next patch when we enable socat for our CI images we need to disable this part of the test for MacOS. The bug has been raised here: https://gitlab.com/qemu-project/qemu/-/issues/1495 Once that is fixed we should re-enable the test. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- tests/unit/test-io-channel-command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 425e2f5594..04b75ab3b4 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -31,7 +31,7 @@ static char *socat = NULL; -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); @@ -128,7 +128,7 @@ int main(int argc, char **argv) socat = g_find_program_in_path("socat"); -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) g_test_add_func("/io/channel/command/fifo/sync", test_io_channel_command_fifo_sync); g_test_add_func("/io/channel/command/fifo/async", From patchwork Tue Feb 21 09:45:47 2023 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: 655360 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1868958wrc; Tue, 21 Feb 2023 01:47:31 -0800 (PST) X-Google-Smtp-Source: AK7set9HR7RsCfBEk1o1Q1Crt9PULk3GqNtAYQT8QGzJqFWVnvrXUkCHR9kSnY9pW2NwD5NyRcOh X-Received: by 2002:a05:622a:100b:b0:3b8:5057:3776 with SMTP id d11-20020a05622a100b00b003b850573776mr5867496qte.13.1676972851311; Tue, 21 Feb 2023 01:47:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972851; cv=none; d=google.com; s=arc-20160816; b=uMDatDsTivDpSEaWz00GVyQYRWVbw+ACY2rwR30bqXq3GsStZ9quTG4WiZhiPpSUEh S7D4/jtFdqhHsiaNClyExr4vpRMYNUNg/d2VQSmYe+3stYvqu2z8iCxdswPHa//m7ZVv H2+QHDYmFVRScE3V7a4IYBp5XYlZos47wWfBRWRTvx2MiIyzsrDyuo69PzBOT4rg3bLH OcRbuSat+qIKVj8qYNNpZ3W6x6ImP0s5toP/U72GsHet6x7MOrlmaxJFSkwYPv/Uh+hB w/bnA9lkt3Se3izKG/fpxllEu62F8ScMLCLVbDCGeqg7MCqelfU/2EeIoXXhc5ZF6sBJ T8cw== 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=a8I/gpv5PwjCdlqFPKyWJxiKZg1erGV90AM3Rkwgb5Q=; b=At7mtvQrdD2HMXQZVExPeHw1ZE0EyrlwtanJYETD2lit8tkPJnNpBUyC6mfFmPaZX8 rWaz3AI129nJEkKZkgw/yoKMl5N1fuoae+9JnAmidPM8HIzFs9TMoH5cYGt4lK4s0luQ DhWMaIPYpaLewC1h18rpbODu391F0wTN4kObaPDmkx8QhrZzm9+VkZZ1nXQpvZK7Elsn MUjbR+ivKk6rdgs/mJHOxlwQbvkobE6N9u248nu7Ev7k9YgKzOtRlUTeG2Q2WNr3giJJ hmsvQ1MBxiGUwg3PSVDENDCOI5+5lmnb5WapI/PWijHBF0CCG1I3OqxbW72Bx+zyUCe3 4dAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e6ultFFO; 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 j14-20020a05620a288e00b00728578b7527si12676531qkp.528.2023.02.21.01.47.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:31 -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=e6ultFFO; 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 1pUPE9-0006n0-Rd; Tue, 21 Feb 2023 04:46: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 1pUPDs-0006YT-UO for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:14 -0500 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDo-0005io-CL for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:08 -0500 Received: by mail-wr1-x435.google.com with SMTP id l1so3434351wry.10 for ; Tue, 21 Feb 2023 01:46:03 -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=a8I/gpv5PwjCdlqFPKyWJxiKZg1erGV90AM3Rkwgb5Q=; b=e6ultFFOnPstKHQc83fStnpGOCJ6dNAK3cj2vqFxVjP0bOW7e/IjHl3Z7KpqTiggs9 Q1cIa8+EA6fgPZSGQQ9vAVzCNmpxJUxpJ7JXxPnAwgETJsv3/aj20gZ+KonOwHpykk7J J8/QHkVWRXwSpmoGykcM94uB2ZXHc5YxhbBoJCd07lHXnqTtdAnXOJONPeBlZcii5sCB Ce9FSdiIqm9Vt44xdRS5k9Mg20Ypp2EFJOMMgTHQvdtBnb29aqDtX6KTTH2U1mryD0rw sURcIcuTDPxQyEGKaAQu2pcDF7pkkfvFw6TGKgMC7KNK4kzUKzFC4/Z47jXSQLY3tUgP ABrg== 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=a8I/gpv5PwjCdlqFPKyWJxiKZg1erGV90AM3Rkwgb5Q=; b=RRJOtmHJP+8TLOUhTXQteg8vMAVJoM0f3R6nCcLqhTJq5nwFQjv166WTLyvipwScCt o32HNbdmvM/OJ58WPpZzWUyzTuAYMjMBGg9rv2JDuo/j7T69/pe2QELinzKf01CRIPmk XVT/U+JaIqtS763fRGrGgw8dzDBEdRLToW2jM5AGEWXItqZJeffleusvCe7zsJFVcd3S vacovofWRv9ixXBlfgsyQoUWDRWGcySV3giuhqumaaXdVSFlhh7j/CN9Pm4/E2GVFn5v mdhv4DeGJ6fkzjlevVK7HH/56EAdxYxWuInG9Veoq6VKzJMfGNbM/DSyF+dgWjaU82ZT 2XkA== X-Gm-Message-State: AO0yUKUMLM3wbMMLMbDwifJOFRxjoM++evHgsLfwX51yh5PTMYUKoCXD nVwTiSpMIvNcwoSNTLHG7cONSA== X-Received: by 2002:a5d:444d:0:b0:2c5:4c32:92cb with SMTP id x13-20020a5d444d000000b002c54c3292cbmr2067750wrr.54.1676972762874; Tue, 21 Feb 2023 01:46:02 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u14-20020a5d434e000000b002c5a1bd527dsm3303047wrr.96.2023.02.21.01.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 640351FFBB; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 03/14] tests: add socat dependency for tests Date: Tue, 21 Feb 2023 09:45:47 +0000 Message-Id: <20230221094558.2864616-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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 We only use it for test-io-channel-command at the moment. Unfortunately bringing socat into CI exposed an existing bug in the test-io-channel-command unit test so we disabled it for MacOS in the previous patch. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Cc: Marc-André Lureau --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos8.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/opensuse-leap.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 20 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 8934e5d57f..44d8a2a511 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 65ce456c48..7622c849b2 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars index 65b78fa08f..da6aa6469b 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 4a569d82f6..56cf14e553 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -94,6 +94,7 @@ RUN apk update && \ sed \ snappy-dev \ sndio-dev \ + socat \ sparse \ spice-dev \ spice-protocol \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index fbc953c6dc..1291ae1b04 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -105,6 +105,7 @@ RUN dnf distro-sync -y && \ rpm \ sed \ snappy-devel \ + socat \ spice-protocol \ spice-server-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5175095a85..856db95100 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index b61f664ea2..e3dba71ad5 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -120,6 +120,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b69958c69f..b00e9e9bcf 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 96b524fab6..fb1129f256 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 08a75cebdb..7a2b864a38 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 5930e6fa5d..5a3340e964 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index c65d9830e7..422fdebe8f 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 2ae56c978e..78d7ae6211 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 0db86a0fcd..d06ea3605a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index b659c0b8a8..21ed1c6081 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 0a404c15bf..95d30e7936 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 5d60a96141..8e06d080b8 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -113,6 +113,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm \ sed \ snappy-devel \ + socat \ sparse \ spice-protocol \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4b2c02d6ab..568c1c979f 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -104,6 +104,7 @@ RUN zypper update -y && \ sed \ snappy-devel \ sndio-devel \ + socat \ sparse \ spice-protocol-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 13ab0b6887..f34d88d33d 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 6467bcf08a..2854748f49 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -101,6 +101,7 @@ packages: - sed - snappy - sndio + - socat - sparse - spice-protocol - spice-server From patchwork Tue Feb 21 09:45:48 2023 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: 655364 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1869071wrc; Tue, 21 Feb 2023 01:47:53 -0800 (PST) X-Google-Smtp-Source: AK7set/LmRUH1nnZ2zJhaI3ZGSqW9SMUuNkNh321jhYLjJBW6sBKfNqKYx0eFPXrQn2me1n7rUID X-Received: by 2002:a05:6214:624:b0:56e:9e34:9298 with SMTP id a4-20020a056214062400b0056e9e349298mr7909754qvx.8.1676972872838; Tue, 21 Feb 2023 01:47:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972872; cv=none; d=google.com; s=arc-20160816; b=ivj0XOmj8V/hb1/0wO4aSBJp8+v8P4KwrPZ+lJBuUKEZGCV4Iut7BJ1o7cWwtl5CZI 9KPwoe9Cj5Y0wwbS7ROFtb/i0XyPAQOeMKIQoFBX2T/9r8CJGm4PT2gIldBC9x0zuSHo E1jyQwlZANTYLxyLsLSLqR7JyXKvu1Q7rSj7iBzoj0BwItrLVMXbgYbL292r4hlRcvBe OPHFCY11JZ8CmRZeWz87Wvu+91KewI0SaWh/irPr4PlVFe0CJt04bDhT6gfmuSDnU0g/ faLn3lyJzjXrN5W4V6/zV6nlgpjwKY6QIcUB5b4XhDRL7mbuyPbQirmCH8hTdmw8S6YK nHmQ== 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=TA6OOWQ91gwMPVdJaiqremUPesLCo2/3y2+/jq8dGYs=; b=y/GDlzmahw/1/mdC7WJUHyHG2Pt87kWjCI+QnWAUFgvKdKks+PkV6tVZ5hLiHXJexU hFpw5RhPZ2n6JwWdfM9rp8ssmKl0Bef/hVGqM0KvLsRv8eEQmO1dUCi7tZT0zFRiCg6H BSHeWxbmBH1PyDLz0VngRGzckZ8LQuv94nHlcH6MVmT7MgyUClFKOUBatCr8w0sBUuWp NO7hLai7zCe9dkWsWRatwNSYgTDmXCJtKI5QhjX+S/Fe1TcrQ0xqyv+aKU9IFBNUD9Zf LXwJ3ZXWSM+uJcL7pl/reGRAik1TdJ9OFX+vZv/0kgWhjimNnIKtkaWjvRam+0BeZzbl FhEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NpIh7un1; 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 az34-20020a05620a172200b0073b2ce32470si12230183qkb.106.2023.02.21.01.47.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:52 -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=NpIh7un1; 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 1pUPE4-0006gW-Kz; Tue, 21 Feb 2023 04:46:20 -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 1pUPDp-0006Xy-Dv for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:08 -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 1pUPDm-0005hm-Lh for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:05 -0500 Received: by mail-wr1-x42c.google.com with SMTP id j2so3531303wrh.9 for ; Tue, 21 Feb 2023 01:46:02 -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=TA6OOWQ91gwMPVdJaiqremUPesLCo2/3y2+/jq8dGYs=; b=NpIh7un1vqUK8m7PlxTTbmWgl87vvyqbHz//QFdv6SAY1iOknzAM6DgACweetBf2Cf uZXgFXW/EWjSisvJRPbU49rirlESKvn3ODFFCHKZ5l4DrZymW0K55EtyDEhalR7x4VEd Mp8CnQ6b6salwmDhDBiGOcfKEc0i5Nv8IaV6h9jq3DtbwMuQM7u3Rc7fCV1SxeLjKbEu 22lQBEXP5DXOXTu6Z7anuR1vv8V/9u+Mc6dh0POgCGp9PTITSheiifD8B+zWjBX8OqCa 1Xkh0Rs3XpW/vWIO4AOKkHb5fVORAudp9dRiWop9r0161rARncrjuHBDjddNtuMhM4g0 d0KQ== 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=TA6OOWQ91gwMPVdJaiqremUPesLCo2/3y2+/jq8dGYs=; b=3qIIg7Ms23xNa1/V4StNxp2UmhoZMmxWHKQok2T8UpugoFi0X5mIMYSNqfKBJLU6gH jtycj+ca2kjFXpopJzyFaYCcGX5ZI23vyH1eoFFn5DNUS0kyLJ16EfhwfcL4nXfs7zFX Q0CHDWOgwL4zFJgJAJbhuXB/D/9I/3qclrbP3Ngs2rw2xCkdMnkTcshVt5AirIVipOn8 NGohjfDn6RLR3F3OhC2WkJ5VgwvkC4H4jXRwcU+fh71qboaoRMKDuFtXQ8GLFf6lyZpX sqDi88iokF0WvgR2i4ED/nxw2uWVO+oUC/zJD1QcFOiL+Rjo3y61pzR9ku2VocGjJ0PV 6MrQ== X-Gm-Message-State: AO0yUKVWsMPmL5oxzmhrM2eRbRsUDNVvje4xzODpeJgRbMSo8OiFtnb+ W2tGqkvBTKE/upUXczZqG2k9jw== X-Received: by 2002:a5d:4149:0:b0:2c4:695:d644 with SMTP id c9-20020a5d4149000000b002c40695d644mr3686090wrq.9.1676972761241; Tue, 21 Feb 2023 01:46:01 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j9-20020adff009000000b002c3ea5ebc73sm4712263wro.101.2023.02.21.01.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7BF181FFBC; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 04/14] tests: be a bit more strict cleaning up fifos Date: Tue, 21 Feb 2023 09:45:48 +0000 Message-Id: <20230221094558.2864616-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-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 When we re-factored we dropped the unlink() step which turns out to be required for rmdir to do its thing. If we had been checking the return value we would have noticed so lets do that with this fix. Fixes: 68406d1085 (tests/unit: cleanups for test-io-channel-command) Signed-off-by: Alex Bennée Suggested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- tests/unit/test-io-channel-command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 04b75ab3b4..c6e66a8c33 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -42,6 +42,7 @@ static void test_io_channel_command_fifo(bool async) g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; + int err; if (mkfifo(fifo, 0600)) { g_error("mkfifo: %s", strerror(errno)); @@ -61,7 +62,10 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); - g_rmdir(tmpdir); + err = g_unlink(fifo); + g_assert(err == 0); + err = g_rmdir(tmpdir); + g_assert(err == 0); } static void test_io_channel_command_fifo_async(void) From patchwork Tue Feb 21 09:45:49 2023 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: 655363 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1869048wrc; Tue, 21 Feb 2023 01:47:49 -0800 (PST) X-Google-Smtp-Source: AK7set+Zg9HfSvUPTurriz74QkRofWM8057jXIW2peiI6Be/ldJpouO6KjzU191H8/AxGKmepkls X-Received: by 2002:ac8:5a04:0:b0:3b8:41d2:1b43 with SMTP id n4-20020ac85a04000000b003b841d21b43mr21901968qta.61.1676972869200; Tue, 21 Feb 2023 01:47:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972869; cv=none; d=google.com; s=arc-20160816; b=NhbWBxxw8X06b1y8xdBBB0XLuHi5ENZIht0meS2KSF2lkhnHYvNFAwpuuEAIG7YeEf czh+XRbbyOc7IVrqmoeVY7Hx6JKkQsd0ZI94qrlVhRJTRyn5lpOGzTyYpHwTWGMB37Gm XBVwNcN60G1zDvUUlDjxbkzdmPU7Xx5oieZNQxbZWhj3sNZf3FxvA6ipuh/7Iq2UtdL3 K1DrkK0AUYjMdoE2GOYgiAGxSDhawTfHFrWEooXyJPw02Rcz3iBZYtRvW928sgnSBMzP sUoBrT6eW3Kxf+Wp3hmNMqoH+2LOfkXTBqSd3DQwTv9B4I7G6f64raCzMVA30UzSUZj3 RiPw== 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=LcOwnhjPM/EC4s3jbpDRMp18o1Os+GkHpURgW/62Uzs=; b=lTbzzwqgRQagxLrNc61wtx8n3ov7Sx6VOBwBkUHSv15NabFOjOkzfXUflCotWk6SqT sy4xjzMXDHtPtjNAaBm37Nz9gkqvlfr9snI2FNnp33VfDw72IwNzhLK+MiqqfusCITph FbPKtdZ+yvwXU7twq8++zw/CmoHVJFTHq7rFjYGwkfUwW69sE2JL0PE9nrMS0Td2/Acm QrFB/a6Sr2f5wyL864GRrQ7EJET5wJOcekB01+IrzjlYoN+8JkW2t5voU40gmLliH2NV FCl8Hjsn/IRk5JAXmTDPNGhc72YYO0DqVRJqH804oirKcT8ksZqjT/31W/OeSMJYObFI 78hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SJFSicb0; 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 i9-20020a05620a248900b0073b841840c8si3380434qkn.202.2023.02.21.01.47.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:49 -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=SJFSicb0; 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 1pUPE7-0006j3-47; Tue, 21 Feb 2023 04:46: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 1pUPDq-0006Y5-T7 for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:08 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDn-0005iB-9i for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:06 -0500 Received: by mail-wr1-x431.google.com with SMTP id p8so3840492wrt.12 for ; Tue, 21 Feb 2023 01:46:02 -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=LcOwnhjPM/EC4s3jbpDRMp18o1Os+GkHpURgW/62Uzs=; b=SJFSicb0MiVzHj16vOGIWvxAJzrBrq2vvAAahfYlFMeY9M1Ok5zh4Ls6B24ELfQ9Zk NT4rOzpYKpJbrqGPznnhogusAUj99Q5VAgC9oCSVuwpck7/Otsla0IyLhSZJ5eAZUICz XJ9OUtQr/iaSiK0lBkbZXwCFXNFzqKBe6Zu1cWMex5ZdLDwB/+rOrvU77mSRqq3+zBW3 NyMo7Ok4RfSOoKoPevppSFbzyZ6EEo0LTdPyRoiOLOIcOAWNuSLpMxI36OKafxAu6ysL fdbrgFTrnk8U6wSDGckEUZXDsTn04VhbzprpptW+PnMBRIAVzQ2s4vMvhrKJKBJ3RZoR FPuw== 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=LcOwnhjPM/EC4s3jbpDRMp18o1Os+GkHpURgW/62Uzs=; b=KvC4wcSFPzJiHYdicXYJkC9ZfKhcSvjZ0X1kkiaXQVPuruNSJs9/27Nz5JwjlJeS4C Ow6wiN4OsIJT4aIMXgMrRSbUD1+SE0P5YmjhMTMDvRTOgA8giFkYTdDWOh7LrOXDdb6I YETDvcLAgeZaFJL1v81SHwT/oYTPUzAGKMVvAtrkPHcFbF+qG6d+aQ3sKD+hd3k2iXla veyaAKHu6K2y/OvGhKiBT1ISRahb0PRQpC+g7KeWoE1XR+3Ts3SkZx+STPacLfnrbyZT EUDLsxvzVuec19OCQ3vWqFU/2exnHldLsSexs5p38TCJyCct+qEUaOIhap3ayK5rOUph JW+A== X-Gm-Message-State: AO0yUKUXTZHTiLMzaHQIbQTbfYqUN0lzC4KD4ju/2n6EllhNqolXHHea chypwM54tW/GZyvyHimgv7bEJg== X-Received: by 2002:a05:6000:552:b0:2c3:dd60:d749 with SMTP id b18-20020a056000055200b002c3dd60d749mr1997220wrf.47.1676972761918; Tue, 21 Feb 2023 01:46:01 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id q2-20020adff502000000b002c573a6216fsm2427049wro.37.2023.02.21.01.45.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 98CEE1FFBD; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 05/14] tests: make fp-test less chatty when running from test suite Date: Tue, 21 Feb 2023 09:45:49 +0000 Message-Id: <20230221094558.2864616-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 As we like to run tests under CI with V=1 flags the softfloat tests can add up to a fair amount of extra log lines. With an update to the testfloat library we can now call fp-test with the -q flag and reduce the output to a terse one line per function tested. make check-softfloat V=1 | wc -l 759 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- tests/fp/fp-test.c | 19 ++++++++++++++----- tests/fp/berkeley-testfloat-3 | 2 +- tests/fp/meson.build | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c index 35829ad5f7..36b5712cda 100644 --- a/tests/fp/fp-test.c +++ b/tests/fp/fp-test.c @@ -106,7 +106,8 @@ static const char commands_string[] = " -l = thoroughness level (1 (default), 2)\n" " -r = rounding mode (even (default), zero, down, up, tieaway, odd)\n" " Set to 'all' to test all rounding modes, if applicable\n" - " -s = stop when a test fails"; + " -s = stop when a test fails\n" + " -q = minimise noise when testing, just show each function being tested"; static void usage_complete(int argc, char *argv[]) { @@ -190,9 +191,11 @@ static void do_testfloat(int op, int rmode, bool exact) ab_f128M_z_bool true_ab_f128M_z_bool; ab_f128M_z_bool subj_ab_f128M_z_bool; - fputs(">> Testing ", stderr); - verCases_writeFunctionName(stderr); - fputs("\n", stderr); + if (verCases_verbosity) { + fputs(">> Testing ", stderr); + verCases_writeFunctionName(stderr); + fputs("\n", stderr); + } if (!is_allowed(op, rmode)) { not_implemented(); @@ -837,7 +840,7 @@ static void parse_args(int argc, char *argv[]) int c; for (;;) { - c = getopt(argc, argv, "he:f:l:r:s"); + c = getopt(argc, argv, "he:f:l:r:sq"); if (c < 0) { break; } @@ -874,9 +877,15 @@ static void parse_args(int argc, char *argv[]) } } break; + /* + * The following flags are declared in testfloat/source/verCases_common.c + */ case 's': verCases_errorStop = true; break; + case 'q': + verCases_verbosity = 0; + break; case '?': /* invalid option or missing argument; getopt prints error info */ exit(EXIT_FAILURE); diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3 index 5a59dcec19..40619cbb3b 160000 --- a/tests/fp/berkeley-testfloat-3 +++ b/tests/fp/berkeley-testfloat-3 @@ -1 +1 @@ -Subproject commit 5a59dcec19327396a011a17fd924aed4fec416b3 +Subproject commit 40619cbb3bf32872df8c53cc457039229428a263 diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 312a4d301f..f9ca6a93b4 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -609,7 +609,7 @@ softfloat_tests = { # The full test suite can take a bit of time, default to a quick run # "-l 2 -r all" can take more than a day for some operations and is best # run manually -fptest_args = ['-s', '-l', '1'] +fptest_args = ['-q', '-s', '-l', '1'] fptest_rounding_args = ['-r', 'all'] # Conversion Routines: From patchwork Tue Feb 21 09:45:50 2023 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: 655365 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1869087wrc; Tue, 21 Feb 2023 01:47:55 -0800 (PST) X-Google-Smtp-Source: AK7set+GMf8uxzDMFCUX3Be2hGuyE9rBT0T7xK2LRZPbxsL8iYMJ2gA2iDlKxQ2i5MVISyWp2T5f X-Received: by 2002:a05:622a:120a:b0:3bb:8c08:dfb0 with SMTP id y10-20020a05622a120a00b003bb8c08dfb0mr23269180qtx.12.1676972875121; Tue, 21 Feb 2023 01:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972875; cv=none; d=google.com; s=arc-20160816; b=UwsRFxFjBW4DSDFQphkeeWtx6LGy9FcyuPQgY/q0gfvP2iKeLp06GoMTByzMhmwUtD DX1QFF7u1ewaGrmxVgnaa+aQ+YctvHGn1pql9uK+pHQ+YqghXYU31FcAe+miuHyNoRKr bosep2gjCDoeThIZhHb7r1I6MtqtJuzVaQ+mKJHXagMYpOmfj2/Q846NxqSJSGJuF5tH Vq+1kBZuMsqLcItpOQKO1HwIwGYeQ6v62XvMvnlEWCtDy7vt0Kwk4nTTbuAIZ1R1B9KI XVZhq3MaoC2Lb8kthARe9XuDCPA/5KZVPjNDkrc2TPMSnl5Wsq3N8wPyGdkn0GtROa1B 5wTA== 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=fPMJZKPW+lS52lKT2TCgAnBcE8BtNLFJK6252gDfDns=; b=Q6MWQQb4xiW7Il/fVuCAe7xZ9n9gUQEQy1LHNrwIBCtR4IRhNsDRBA9IKVJZj7dTbm h4+CTHMpoiqTPqIYlV/ZdmsKzwbNutL/E8vz8FpjZi0qYb809Yp600UrF/brj5CZzYe3 ooSHJM7s7Fr4AlmPVRvL9CmeA4DAS5xN6bEP0g6XGDbQD1bTo8HMGtwi33D1ySqE8yKa +KjX3prKJDaUVVcxeacPAudw1lMu6FwkM0DlteU6nQpLkolEfw7ScU69KS0Rs66Ondgv q63f1S5zfwzN7eRcoAk0KCeCVtK9BRttlMebPsb7U2ncqjSJzGGiaXFDrRg6xYecV8mA R96A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ewmLyAlE; 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 p21-20020a05622a00d500b003b63c3333easi12013442qtw.158.2023.02.21.01.47.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:55 -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=ewmLyAlE; 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 1pUPE6-0006iL-6q; Tue, 21 Feb 2023 04:46:22 -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 1pUPDs-0006YF-DR for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:08 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDo-0005iO-3G for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:07 -0500 Received: by mail-wr1-x429.google.com with SMTP id r7so3541824wrz.6 for ; Tue, 21 Feb 2023 01:46:03 -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=fPMJZKPW+lS52lKT2TCgAnBcE8BtNLFJK6252gDfDns=; b=ewmLyAlEqI8ExrnzJ4o629Hx+2naRUe+He88wAsS1qwvHnZpQeSwOgaRd1izFWLsPv djSOs7+k9bOXk0Jh/wKG0kHH0EXXAq+QYidCFblBxGPsxSckhuwnjMw92QNA3l8E6O4Y 0WhZ+wJpUPSdrRllIWT+jG/X46HJS35zq1S4aBEd0u4zZ6ecLQSgkmY6MPPMi3xWDKPe ErdtZ9UoVH75EvFQ52Ldtfv/coNqWYh1/Vimsc2ZB7V8fihCsNdpUTwwTMCLS57/oFmD ABQ8oepZ1WgT0VynYxIqzNGOKx1iR/HorQFPjR12r7MyM7DGNup0RU4QAvYI6Edqlw9o O9Iw== 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=fPMJZKPW+lS52lKT2TCgAnBcE8BtNLFJK6252gDfDns=; b=0wDgNEIhlyYNZj2rz7gzABuD5XWJ2cEUXI9eec7IQdb3Tkbjyx120PZfnaZIW8CLqh piw52WRTKvPqaVIGrvdj8OvVYEwNnSQI70QNOQ7MQ2/0L6LFCeV0j4UTKL4tXfVmt74S ml6IOY+0M7Fv1R7N9dwjnNQDCBC8VV3rugCHEq2iHUKmc4ydesrGa9BUljRGEm4QRlUt NPJiw1YpDA2wisKZWDlvD67nrM+CQP3ws6dL72oAAJNvloEQx9PD7/QVo2/WNr9I5Kvj pAyxzlIHJ/H8MAcT4HRJ1RSceewVeE8I8SbzPHO70K4Fx1OzQYpRMBs+N9gPdpPYRt/r +kuw== X-Gm-Message-State: AO0yUKV7TBYyTV2+DE2B3f2JGOOCLQpavtySWZW64y+6975JL+17031r nMcD6Mlua2dd0V4pkDqFlV160Q== X-Received: by 2002:adf:dccb:0:b0:2c7:691:18b4 with SMTP id x11-20020adfdccb000000b002c7069118b4mr732405wrm.39.1676972762183; Tue, 21 Feb 2023 01:46:02 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o24-20020a5d58d8000000b002c7066a6f77sm738070wrf.31.2023.02.21.01.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B010C1FFBE; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 06/14] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Date: Tue, 21 Feb 2023 09:45:50 +0000 Message-Id: <20230221094558.2864616-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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 The meson log files can get very big, especially if running the tests in verbose mode. So dumping those logs to the console was a bad idea, since gitlab truncates the output if it is getting too big. Let's publish the logs as artifacts instead. This has the disadvantage that you have to look up the logs on cirrus-ci.com now instead, but that's still better than not having the important part of the log at all since it got truncated. Fixes: 998f334722 ("gitlab: show testlog.txt contents ...") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20230215142503.90660-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/cirrus/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 7ef6af8d33..a9444902ec 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -32,6 +32,9 @@ build_task: - $MAKE -j$(sysctl -n hw.ncpu) - for TARGET in $TEST_TARGETS ; do - $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 - || { cat meson-logs/testlog.txt; exit 1; } ; + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ; done + always: + build_result_artifacts: + path: build/meson-logs/*log.txt + type: text/plain From patchwork Tue Feb 21 09:45:51 2023 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: 655359 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1868860wrc; Tue, 21 Feb 2023 01:47:13 -0800 (PST) X-Google-Smtp-Source: AK7set/U+M5JddvBRdQAv/c6c377gQgOJqUj1ZI5gnQZ86WDLcxIFEU4HcD6eu3M1T9PqeeVVHhz X-Received: by 2002:a05:622a:86:b0:3b8:6c68:6109 with SMTP id o6-20020a05622a008600b003b86c686109mr15704210qtw.21.1676972833605; Tue, 21 Feb 2023 01:47:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972833; cv=none; d=google.com; s=arc-20160816; b=CEplD5qch2H1uO+FDEfM9zHcCiIK6aX06BPKmWLXev3gF0RId73ofUiNA7P7zCjc26 Ot4gc7LwGwAMBLspMh+S7yB4aTMrLTtUdHwyAhugd2+cPgeV6MJ6soLF0AHmaKEnfTms FoCPTKjZVGoNjdXXb7jBXKyLewE/y6J0iIkuhoG53IL1q0cmx5NkHvwe9tCP3K7NvbhV Jk4/rJT9qFefF5Zzv2fApSU9o9mE0+e7TGLqAWPG2UJEKXrhAMUrgtaFYVtavT7Zrloc fbwHg3ycrisdUnn1o/vQsOcyIzSVyfPEsGIyfYE/Zl+jtVPEycGeKP05E8Wbp4lR/aQD N2Tg== 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=x9oUeIxFtfrIxx53Ee0pGIAyAlKeHllh0Hr23NIHP5Y=; b=rpJgZhG+1dipN76het4lK94jWRsYQ5lexA2w+50k+aFoGgWlVu7he9zEW48D7QT/ga KDK5NCQZ/B/d0C+TZOdAXUuf39PqUymkaAgn8EFMPH//VSSNdzvuoK+BDsHP+yzL3iUh HvUsR0zDsja3V79uwny3Y+eGnmVXLrV+8L1SQaD18CXDLwXAsybKIAuc26PKbtadbIUx 7a+Vm4RuwRETN1pWlhxgs2hsK5su+Gxky46Axuhomktphi6RjjVivPko9RBPcZTVTRDh SfxpZqAvkRuvYttDvEles/dBUB3yzLF/JPyqMhVo0O0qnZiXDT9lCtGUd18wSwApYx08 MjaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dEM2nR4n; 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 c22-20020ac87d96000000b003bd06074343si12008579qtd.726.2023.02.21.01.47.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dEM2nR4n; 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 1pUPEB-0006pF-R2; Tue, 21 Feb 2023 04:46:27 -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 1pUPDu-0006Yi-4g for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:15 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDo-0005j6-PW for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:09 -0500 Received: by mail-wm1-x334.google.com with SMTP id p26so2767133wmc.4 for ; Tue, 21 Feb 2023 01:46:04 -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=x9oUeIxFtfrIxx53Ee0pGIAyAlKeHllh0Hr23NIHP5Y=; b=dEM2nR4nNKksq5n5hF80XJfb8frPKPmZLZAFSwTW1Ig//9TGsQI8afx0nw+WZEhiti uA+J0/CyT+dmB6zHB9O4qxyAbK5N+JZWUBwsls6Mln4U/Dn9oUhSKVSfszNG+/skeV9q HkN9Z/UR252gpXPY8esLooC0AeX+bsRMMWyBvgtWmqZ0YF37ytuRVrTHXSrzGmCNFKnw qwSVd/C3WlxVJekSKGGI4XF4MMWgiEl1q4iP5IeeOwdse+wvVELdPo7Zv+tlqLaublMU lLXNUsWA6g30Oa5S2+5/AoaOIkQuumWCZLwAIz3bvhhuQ2+qsrbhgJagA6sNamsW0f6H JLwA== 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=x9oUeIxFtfrIxx53Ee0pGIAyAlKeHllh0Hr23NIHP5Y=; b=BJ8PYpPa6XaRIfH7XRtstupDbht/W9BHUfUbF0pwLQOL6K4TlKTRYIjewzN3oZQmhO 76y4HK9p/ULjNlXcau65gBR36pTKp8B8NjhC7LoKJEAqTxl7c28kODvGN4+HZL0UBbU6 A4jCAtJBn1JuQ3jJA+GsOI3U/+aRDXXdQu8FnqIyZrV9inIRVDf1AsOyBJJD4pww3FI2 NHfARHh7p98W0rCX0lRvLonWY1wTTKOB2c4s0czRntsO7ByAAQg261jPDSqGYZG809gg BspLKPxtIBjKOqielD3oJv55+PFAk9uwuiXHkVtCc0FZwd+OIi1Hx2kB/MerLta0hnVY QiQg== X-Gm-Message-State: AO0yUKXEIyN5MmNGcFmHTeeG79z3lMioojlEpYeV46wIKBhDpX+gI9Nc gDV/Yv2Rx7oymdrgkKauiE/ENw== X-Received: by 2002:a05:600c:3c84:b0:3dc:545f:e9ce with SMTP id bg4-20020a05600c3c8400b003dc545fe9cemr3216513wmb.24.1676972763160; Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m4-20020a05600c4f4400b003e2052bad94sm15076290wmq.33.2023.02.21.01.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CF1CF1FFB7; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 07/14] gitlab: extend custom runners with base_job_template Date: Tue, 21 Feb 2023 09:45:51 +0000 Message-Id: <20230221094558.2864616-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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 base job template is responsible for controlling how we kick off testing on our various branches. Rename and extend the custom_runner_template so we can take advantage of all that control. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/custom-runners.yml | 3 ++- .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 10 +++++----- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 9fdc476c48..34a1e6f327 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -15,7 +15,8 @@ variables: # All custom runners can extend this template to upload the testlog # data as an artifact and also feed the junit report -.custom_artifacts_template: +.custom_runner_template: + extends: .base_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days 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 f512eaeaa3..cdae6c5212 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04/20.04" ubuntu-20.04-s390x-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -43,7 +43,7 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -66,7 +66,7 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -108,7 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` ubuntu-20.04-s390x-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: 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 42137aaf2a..50e5646a44 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch32-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: 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 8ba85be440..13e14a0f87 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch64-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-22.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -46,7 +46,7 @@ ubuntu-22.04-aarch64-all: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -65,7 +65,7 @@ ubuntu-22.04-aarch64-alldbg: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -107,7 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=40` ubuntu-22.04-aarch64-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: From patchwork Tue Feb 21 09:45:52 2023 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: 655361 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1868978wrc; Tue, 21 Feb 2023 01:47:36 -0800 (PST) X-Google-Smtp-Source: AK7set/PWrdDv6Nh3BaVBQVmtsEiQ1qdKbCdFyUA4tKuGu9ZBSTP4CmLNnS4ZY5MFWqm7Re61JLT X-Received: by 2002:a05:6214:d83:b0:56a:b623:9b09 with SMTP id e3-20020a0562140d8300b0056ab6239b09mr4887371qve.14.1676972855927; Tue, 21 Feb 2023 01:47:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972855; cv=none; d=google.com; s=arc-20160816; b=R2+22fazWqmOjl+jIE6i8dVQLINDEg0Rx87fWosMORM7zYS2SbyuK9DZZ/uhoCCHfs lfwsRH13s77LewRvGpbo5JoZX9a6QrQ8aaXgFUMiywhsPi0Mwh62rQxK8GlxMLTKWr6f HWnn9i7/0GP1nDwKJDCBXPXv/G2WnOY71UuuEHy1In+YZdp2brEc5RtWVYYPBFgB86aV gnrRdBgxRdKwc563Xsbu6wbZELq1orX+jBbD4Wn7aANcUxKRvpoGfQQn5rWDxxo7vvbX yin553QeuOq0SblCqqAmAW3NujZJKTGw4Nv9CjPpvmfdvFGwENU8rQUOcbhisu0QSmlW Kggw== 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=UZxilB3yNWFWB7/hvwhbCfncsMYWzYUYFV0McBYO3N4=; b=mhOTC7Dfh5j7kW/UhJRaPB9nwWodCecoO2mnuyYS/FQXTWS+BmqDpUalBjGBahJiQO xIVOA7ItnY1xIcd01iG8rBHpa/XwFg0mdPJsaWzDZLBMpEnYFwnhnUjbgzIxk8I6AZEr BV5g9+oBaVYQLaqdSbL+D2qXscPj7O2WaWk3L5iCkFtn/YP5EK3xjmxSawhpQ9RNh0g6 S9ifq5d1ffHozru6N56tefubB0aBaOyyBqoFNnmmeBZg9lqT3POuKroeubHBYOtEI+EI Vo0nB6iw4Z7p0cpb4q6G4VI0PJfhlnm3+j2uSBO/NAJPWTZpWepCXi/SKv2kDcBlxGPl yoeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y5pcMeuD; 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 u2-20020a05620a0c4200b0071a758b5e70si2888096qki.299.2023.02.21.01.47.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:35 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y5pcMeuD; 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 1pUPEB-0006pR-Vc; Tue, 21 Feb 2023 04:46:28 -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 1pUPDv-0006Yq-Rn for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:14 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDp-0005jm-Vf for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:11 -0500 Received: by mail-wr1-x431.google.com with SMTP id z8so3430903wrm.8 for ; Tue, 21 Feb 2023 01:46:04 -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=UZxilB3yNWFWB7/hvwhbCfncsMYWzYUYFV0McBYO3N4=; b=Y5pcMeuD6wgCirMcP2uYe3tCgZkdsrpFssEpaBXThOkO/MDa/gdaWj2zcF+sxutpU8 72YmAZzoM59x8GqEL8qYxHHku/mSbLTkwlIQMjC3bfOFXjdtv1/x3RWd3kUkkKOqBh11 0mf3+Ssr7YxR0wTJ58OpoYHDz5jQXEhIaCeTKebx9CMDggVCmdPtXZfAjZp2YPHVinCa 2zjaua69W8p/pOQw2g6AJnN2/vBcdUp8uAp3Vq39veDuAeA9Wsxk1IUWONs9AedsjVrF 7uBne4BAw4OyoSv+NzvAaA04N6F8UFSxzyabhWmPKbHy+1s6Mi3Y3VZxnykckGeVaG6X 4Z4A== 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=UZxilB3yNWFWB7/hvwhbCfncsMYWzYUYFV0McBYO3N4=; b=EprL9Ltk2nkNhGYaJJqEw3q4R2/9XK/T3Y1MDIItVsJR9XZpen5DAz+mxzS75qmkAW Jrz6sUGQiS51dtGi0+QjWAsNHHU3F6l0/D/v2MV1Tp5pJhfHwhhhtOTes0tdMLaUSsxD 0iGc2b0Sv/LwyBW6OF8hA1SSuXf/RJ2VHKdx4lH961+Q8KSUvJknz9WeUlpqaiYi2bmt FdYsQFls9RlBt8mL8aga8qU1YBkmvWIsXB61zY6aZk/yjLCgApzSyWlPEH429Y3W1f2R /b5V3n3IqvVozxaynBFuJO+vFVjCInD17JGNuSWu6NHyqT4A10H2amcnEYIDkVvvqXIq pA+A== X-Gm-Message-State: AO0yUKXhuPHxpIg9CC9QSHVgv1r7YutfYxyUyiY6CM1ns/BeY+j2kaHK Rstvo/Y7yg5qyETkNa47DLs3yg== X-Received: by 2002:adf:e689:0:b0:2c5:5da4:a3b1 with SMTP id r9-20020adfe689000000b002c55da4a3b1mr4458091wrm.69.1676972763846; Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id r1-20020adfdc81000000b002c5503a8d21sm2005375wrj.70.2023.02.21.01.46.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:00 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E6E241FFBF; Tue, 21 Feb 2023 09:45:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 08/14] tests: don't run benchmarks for the tsan build Date: Tue, 21 Feb 2023 09:45:52 +0000 Message-Id: <20230221094558.2864616-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 All we are really doing here is checking that TSAN builds compile and are therefor a tool available to developers. The benchmarks are not representative of QEMU's actual threading behaviour and they burn precious CI time. Indeed switching to check-unit reveals many unaddressed issues which have been logged at: https://gitlab.com/qemu-project/qemu/-/issues/1496 So for now disable the make check and make this a build only test. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- .gitlab-ci.d/buildtest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 8f332fc36f..e9a67e0191 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -465,7 +465,6 @@ tsan-build: CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --enable-trace-backends=ust --enable-fdt=system --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=1 # gcov is a GCC features gcov: From patchwork Tue Feb 21 09:45:53 2023 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: 655371 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1870340wrc; Tue, 21 Feb 2023 01:51:49 -0800 (PST) X-Google-Smtp-Source: AK7set+akvBkMAgYqyDV5NmH3XpgxIdjSKat6EMVuGBq7daT+6glv5LUE2O9J+7lmIqcQSwnhs3y X-Received: by 2002:ac8:5b87:0:b0:3af:b6bd:aba7 with SMTP id a7-20020ac85b87000000b003afb6bdaba7mr26422012qta.43.1676973108969; Tue, 21 Feb 2023 01:51:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676973108; cv=none; d=google.com; s=arc-20160816; b=s64Hnzq91FOx/IoQtrYwh2l0S5wOvPnW3/R+vUDkvM98JComDkS/UIeVYdFFGkeUJ+ Mo+WMqmsLIke2+NxGs3PSYLD41WmOL23qVjVpEC2ryUZHA7pTG/j/zZ84ThwPO/wMsZS xne63z5bXI4r7+GRQ4DXos9wOJ1KmS2m9/IxJZcNCDCxRpbemIz/zKI+5lHoiMpBRqvy 34fK/PtrN6WgooxREnykBUzEwQUQz0Y8gZV7J2EAhIsZ+hsgjH/useq/kHL5NL3VvO9l yNxQ8xVZx/jxrYU8C8VBq1iRaVx8qDGxl5v4qYbR8e2fflQFQU7ZVbF8gXR3c4fKfcVU 3F1w== 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=R6LuilDiNMIitB/4UwUlVn8mFSm9sO8fNeJzBpcpt3o=; b=RW1nyVIxU0w0GahDNMeWTjeVnQcr697iGWISz/x8hLLCIa89puyDzdCo5z697iBwzA auJLwlQbzyM8EMrVIXf1J27CdbleN32gpZzLcWpWYXrSEAUwpQNfA1GjLqPm7Z2kNH60 0NvfSsoPAdSHlIMDwUa3jsRw9aC29wqTSRenRiAxPmjeuWU/jZtYmBML0mbJSdno6i3E +i2YjWNXru3eH19ysHl9zjcBuQOyZej+DJ7xbGkL5FFXvV7m1qz9dX6WhBe2i58dIEZb 6mUqY9LrWFSpwQxd1x5CjIN5EmhYZYpN4bmQwjgNAGJFSvV9V3yjtRkRTdaMlEJDwz3l c6cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mT6/OZQQ"; 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 y13-20020a05622a004d00b003bd00fdf974si12103403qtw.9.2023.02.21.01.51.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:51:48 -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="mT6/OZQQ"; 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 1pUPEA-0006ny-Un; Tue, 21 Feb 2023 04:46: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 1pUPDv-0006Yp-Pw for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:15 -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 1pUPDq-0005h1-2q for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:11 -0500 Received: by mail-wm1-x329.google.com with SMTP id p18-20020a05600c359200b003dc57ea0dfeso3035175wmq.0 for ; Tue, 21 Feb 2023 01:46:05 -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=R6LuilDiNMIitB/4UwUlVn8mFSm9sO8fNeJzBpcpt3o=; b=mT6/OZQQszXxnIVoB09omH1o71NtkllRs0CmrZRipBRiYcwY2ENVTst8Vo2MUExPNg qachfxnpxRvVUd/VADYMEvldWhBpVuHXR9SOAjQsbFoQ5Acr5l9fRzeLFqDy0WXlgaxZ tYfTC4AKFXol7icqnjhv6VC0Ue9NpVYfPqXhc61G3lj8tUf8SjkbB9fqQp+RMiafGI8F 0+kxJeCkwWs8k888CIh8zivL0b1UzGKCqEFkY7eYLCG4ti3fJ5hkywrUppfWBDeZiflC PbyQO82VhyaaaLjX5TKWQe9AaxLdNydzHYr5FghKS24A8r46NSv2vnlqO7B3NJewZ/LC Ufgw== 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=R6LuilDiNMIitB/4UwUlVn8mFSm9sO8fNeJzBpcpt3o=; b=v6cTI6ryvKcuZBUjvutO8gB+oo95VvYFI8uRR0IoOImOnU9xTm4b3IEZ0qBIlGEQT3 pQU5FqF98S5KI/kMNTRSzLZORu+yK7loVgFivkq3TYL0HzREdpMvmbHMP8cyZSzTw+IN 8JFrPYq8Mhi0uSlTES8eC2TT/pnBbas5FWdauT8CcWDVKspS52IA/t5NET69XAL+93ca dIv59nkA3NbcAWGigbQXD+f8+V68LBH/SpYsTyDTk1GF3xQvVLNZUhvQCtf3UAHvINus WODrxlF3vnLSTtFLu2IDoO9RNR71XvsK1mYHWQ6N2YVG+dU7h6HCPooqTg3gmWlWkyAq eN1Q== X-Gm-Message-State: AO0yUKXty7yquGUvIhvzytENfWDe2syy8gT2J3co0jyd+zCxHSFeBOnQ Gfb9OCJ1k+Hn2jIEVAxhxt0uuQ== X-Received: by 2002:a05:600c:2e83:b0:3e0:6c4:6a38 with SMTP id p3-20020a05600c2e8300b003e006c46a38mr8835761wmn.33.1676972764813; Tue, 21 Feb 2023 01:46:04 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k17-20020a7bc411000000b003dfee43863fsm3410861wmi.26.2023.02.21.01.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1B5AD1FFB8; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 09/14] testing: update ubuntu2004 to ubuntu2204 Date: Tue, 21 Feb 2023 09:45:53 +0000 Message-Id: <20230221094558.2864616-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-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 The 22.04 LTS release has been out for almost a year now so its time to update all the remaining images to the current LTS. We can also drop some hacks we need for older clang TSAN support. We will keep the ubuntu2004 container around for those who wish to test builds on the currently still supported baseline. Signed-off-by: Alex Bennée Reviewed-by: John Snow ---- v2 - keep ubuntu2004 about Reviewed-by: Thomas Huth --- docs/devel/testing.rst | 4 +- .gitlab-ci.d/buildtest.yml | 22 +-- .gitlab-ci.d/containers.yml | 4 +- tests/docker/dockerfiles/ubuntu2004.docker | 3 - tests/docker/dockerfiles/ubuntu2204.docker | 147 +++++++++++++++++++++ tests/docker/test-tsan | 2 +- tests/lcitool/refresh | 11 +- 7 files changed, 165 insertions(+), 28 deletions(-) create mode 100644 tests/docker/dockerfiles/ubuntu2204.docker diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index e10c47b5a7..309a575abe 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -574,13 +574,13 @@ https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual Thread Sanitizer in Docker ~~~~~~~~~~~~~~~~~~~~~~~~~~ -TSan is currently supported in the ubuntu2004 docker. +TSan is currently supported in the ubuntu2204 docker. The test-tsan test will build using TSan and then run make check. .. code:: - make docker-test-tsan@ubuntu2004 + make docker-test-tsan@ubuntu2204 TSan warnings under docker are placed in files located at build/tsan/. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index e9a67e0191..1686558d80 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -38,9 +38,9 @@ avocado-system-alpine: build-system-ubuntu: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-docs --enable-fdt=system --enable-capstone TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu @@ -56,7 +56,7 @@ check-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check avocado-system-ubuntu: @@ -65,7 +65,7 @@ avocado-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check-avocado build-system-debian: @@ -459,10 +459,10 @@ avocado-cfi-x86_64: tsan-build: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 + IMAGE: ubuntu2204 + CONFIGURE_ARGS: --enable-tsan --cc=clang --cxx=clang++ --enable-trace-backends=ust --enable-fdt=system --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user @@ -470,10 +470,10 @@ tsan-build: gcov: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container timeout: 80m variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check @@ -538,9 +538,9 @@ build-tci: build-coroutine-sigaltstack: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg --enable-trace-backends=ftrace MAKE_CHECK_ARGS: check-unit diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 96d2a3b58b..8637a13d86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -13,10 +13,10 @@ amd64-debian-container: variables: NAME: debian-amd64 -amd64-ubuntu2004-container: +amd64-ubuntu2204-container: extends: .container_job_template variables: - NAME: ubuntu2004 + NAME: ubuntu2204 amd64-opensuse-leap-container: extends: .container_job_template diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index f34d88d33d..75233064de 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -146,6 +146,3 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -# Apply patch https://reviews.llvm.org/D75820 -# This is required for TSan in clang-10 to compile with QEMU. -RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker new file mode 100644 index 0000000000..30b9e56793 --- /dev/null +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -0,0 +1,147 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/ubuntu:22.04 + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libsndio-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + socat \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + xfslibs-dev \ + zlib1g-dev && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff --git a/tests/docker/test-tsan b/tests/docker/test-tsan index 53d90d2f79..f6d6590e39 100755 --- a/tests/docker/test-tsan +++ b/tests/docker/test-tsan @@ -21,7 +21,7 @@ setup_tsan() tsan_log_dir="/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-tsan \ - --cc=clang-10 --cxx=clang++-10 \ + --cc=clang --cxx=clang++ \ --disable-werror --extra-cflags=-O0" # detect deadlocks is false currently simply because # TSan crashes immediately with deadlock detector enabled. diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a5ea0efc3b..cc9e34ac87 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -69,13 +69,6 @@ def generate_cirrus(target, trailer=None): generate(filename, cmd, trailer) -ubuntu2004_tsanhack = [ - "# Apply patch https://reviews.llvm.org/D75820\n", - "# This is required for TSan in clang-10 to compile with QEMU.\n", - "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" -] - - # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test @@ -113,8 +106,8 @@ try: trailer="".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer="".join(ubuntu2004_tsanhack)) + generate_dockerfile("ubuntu2004", "ubuntu-2004") + generate_dockerfile("ubuntu2204", "ubuntu-2204") # # Cross compiling builds From patchwork Tue Feb 21 09:45:54 2023 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: 655368 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1870062wrc; Tue, 21 Feb 2023 01:51:04 -0800 (PST) X-Google-Smtp-Source: AK7set+NKlv7dKfI8Qi2QcBO3UMeukJet/lJJpMxSPpwst5U6diSYxmDIkxQdMeG7bcjo7u2GPgp X-Received: by 2002:a05:622a:107:b0:3ba:1ea6:d993 with SMTP id u7-20020a05622a010700b003ba1ea6d993mr6354073qtw.44.1676973064300; Tue, 21 Feb 2023 01:51:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676973064; cv=none; d=google.com; s=arc-20160816; b=pM/rW7zTwPxHo56pPs4w2w89XRwQcejw+zLeh05OyHhryhrqDC9rha3UdpLDHhDP+X ssJc0Uous7PoYeBqjYoVCiCwbFJiAQcSK9exqtVE05lpH1uupsbN4kokVt25wcya7P+z 1g0yLDXypBbc3AvFBNv1IKG6vqVcFoGkC16CyfTk84SXx6KIS/6eHd0SBNwNCSSi9ZQk rebaPWb3oAJbP4zM5G1twoLKfqs5VnV/Mncs6d30j2m9Wt/rxvuPX9kYsS8jZ42t8AEw L9U5DX51fkT0NuZTPUeNX7PAOMVlj/NBqN61Zc/P5G3Z39n1dFn0g+u+lYX4riqkeoUw ZxpA== 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=XyAObTuuAW1poi3AcvAz0z96pccj9dGjW/pdlO/77k0=; b=W3O8TmAn3L16dUdHpMxN7v1zYj9zxAsthQFWUJbbvTx4iKc9r1rzPHkMq0zPLRKqWH ahFr/DFT1h9UknaZU+gYm1ErYoaL3dZrW89+4+A9+iffHmrJM5xr13vZmUlO23yb3Foc WpopFAUDs3hImJ75C/u97P19wcgkvUfHzDtSP9M2d0RFrc6r4crByf+gxt2+9MP7b1TS 5SllIuleG680sIrRmCfJvBHW8ejph8zFWpsIlSCQEsXp5Sn9TR/EcCblyVVMFbHFjnK8 STYa/G3s8h7hFomFLemh+ksuKzty/cDlImL+zxwcM0SN7Bo+2gQ4Qg3W4F7BWXdaTVog 4K7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BrilyKCj; 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 o13-20020ac85a4d000000b003ba106601absi12267502qta.414.2023.02.21.01.51.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:51:04 -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=BrilyKCj; 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 1pUPE8-0006mE-Uc; Tue, 21 Feb 2023 04:46: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 1pUPDu-0006Yn-Rr for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:14 -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 1pUPDq-0005kM-3H for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:10 -0500 Received: by mail-wm1-x32b.google.com with SMTP id j2-20020a05600c1c0200b003e1e754657aso3069988wms.2 for ; Tue, 21 Feb 2023 01:46:05 -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=XyAObTuuAW1poi3AcvAz0z96pccj9dGjW/pdlO/77k0=; b=BrilyKCjGYSvYs4SMKDE7TI5qqNSeAQIbWerhmeMeXI5XXmumEGJmYCUDBLR8I9mCE J+3X3qquh5i57FuFlBa9JP6zydhi7YYbiuXXE94LWEcKqT7L4G5Qsh7uvbAeCiDQ5DZN gK32FNbJKUlKC0j5bdqLJskZ+CyMDf84x2bPxRh3hXZOre2RRq5Liku++B1+QpOkwJki WW4WkFFqjJSSrRUuF6huz9Q0x7dR0YaVGQADYy69LxpmEy0gm4PNpRLQGgdL9cc4wSV3 3K9oRtsXCL3m6uMl98HOB0nt6y5vfKMePw7e5aP+CFB4Mrcy1h0Sv8pBziwwDkfdYk/f 67FA== 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=XyAObTuuAW1poi3AcvAz0z96pccj9dGjW/pdlO/77k0=; b=X1iJB/JDn95cXk8UHfp/RzluSho8NFBNgYkic23+SPg+XVSrH+ashF7SaJNWG4qbIE dEruhHRiOSLX6TWG5NK0PJfD5LYlg65zf/iFQWXeci1SLgS7Uq0Cr7icTc4EDGjLEg3i Qub572T1A0hpiVwVo5yVi6/gN+4r+68u2FAieR/l4zx8y+j0ps1JLZUYcqrYtYLiOxJY EWgRuQbLsYLfLeQJF1hUpNSvvCo0Uo9ILu2hSsP+xaCnreSgaMNRUmsaqnFBtgXX3cD9 P7p3cGPTxehGESFnDtG9W34SnUj9L0OMPw7k2cHdeZY5EplptJ18JknF2agO6k1J05IG /akg== X-Gm-Message-State: AO0yUKV1dDhQ8AtkBncjm64Z+rhtzSdMdNrGn60+6YG0B/GZDSCbrZh1 AO1AJWNT3lZQZybPNxKsyjD4AQ== X-Received: by 2002:a05:600c:492f:b0:3e2:6ec:7fbe with SMTP id f47-20020a05600c492f00b003e206ec7fbemr2513179wmp.40.1676972764529; Tue, 21 Feb 2023 01:46:04 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t20-20020a1c7714000000b003dc3f3d77e3sm4087866wmi.7.2023.02.21.01.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 340121FFC0; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 10/14] tests: skip the nios2 replay_kernel test Date: Tue, 21 Feb 2023 09:45:54 +0000 Message-Id: <20230221094558.2864616-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-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 It is buggy and keeps failing. Suggested-by: Peter Maydell Signed-off-by: Alex Bennée --- tests/avocado/replay_kernel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 00a26e4a0c..f13456e1ec 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -349,6 +349,7 @@ def test_or1k_sim(self): file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') + @skip("nios2 emulation is buggy under record/replay") def test_nios2_10m50(self): """ :avocado: tags=arch:nios2 From patchwork Tue Feb 21 09:45:55 2023 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: 655366 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1869101wrc; Tue, 21 Feb 2023 01:47:57 -0800 (PST) X-Google-Smtp-Source: AK7set8chQGBAUhdrlPcgZKTiZIUTJ3jkRF2rcf7wlE4GyvU7ARwLgUUekVAXCYb0FB9lINQOp0G X-Received: by 2002:ac8:578b:0:b0:3b6:895c:d18d with SMTP id v11-20020ac8578b000000b003b6895cd18dmr7738112qta.15.1676972877183; Tue, 21 Feb 2023 01:47:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972877; cv=none; d=google.com; s=arc-20160816; b=sj8P8nXj570qnYIWiiJVvXyrjQFSiv/MJtYgm9pNBWwqRna1A45R6Bz1LCDPu9oBU0 /iSy0WmS7bNZQ0lQJ0kF2B/qeQA/aLRKVGu7+DVY9rTatNGZ6xFIO7+exrm56gqqnxzU Zvsn1JSPe+FAxvnGS30GHsL8J5N3npYD6X1Ytw0nkEUhkJcU8GzrXcpeD1DZSJIYFsPo 1cK8zaROaD7dvDKKnf9r3wihk+qCd+llPapcXYmjhTudIEvCTkxGME1jEJniAPLngflW UxRY/Vrd5w1Vt7+bcv9eUHOekE78p8hUNk4PDZGqFAavHtOSc6f/gjeXShvmqKDxGpuM bWrQ== 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=SF4g5yXo3DL85kbdFM7PkRMxKfciGx1udkwdiwlBdRo=; b=yWPJiqRxhn9jIW25v6dN6j0hbdxmUqooMPsXuPIg63WD1LRkW/rYMF0tiRd+hyyIQc JewTqe9tqcHtFiE+1U+H3G1JF9QZeGT8SuJDNAYlh0pUznhoGv2fnKqrntAQB1QmhQXq F7DtCpw8V6V3B9lOpAeBINDtsUQ1bDyOmgEJOKgmgit+uhODfBXx+JaW/RGLcyXck3cv j3X0IqhZ73waWksgXePovbmaA8sMwJDx3CAzkqZQPVRiCAo/v/4PnQ9UcRCvXghvLrrz 3Ynu9hig4/xljiw+upqsbU078K6Rv/AWtvUYTz03Wpd6WBlZJBRERDqA4yU/snk8cDKV YRzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xu8VGBS1; 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 do38-20020a05620a2b2600b007280c696c9fsi11064080qkb.517.2023.02.21.01.47.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:57 -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=Xu8VGBS1; 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 1pUPEC-0006qo-Lf; Tue, 21 Feb 2023 04:46:28 -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 1pUPE0-0006dU-Nn for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:16 -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 1pUPDs-0005mL-AT for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:16 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v3so3634013wrp.2 for ; Tue, 21 Feb 2023 01:46:07 -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=SF4g5yXo3DL85kbdFM7PkRMxKfciGx1udkwdiwlBdRo=; b=Xu8VGBS1QOTRz1x7HXuhQdlCFr8fg1u7O3WGdbEQ/hC8+TaLjQ/EbyGqgcED7py/lf VbJ0tenM8xwvABpWjqB7OnyD951IaHOtG4kEbMefCJv1QR/L0LRolZ8yEqXmPS2tSQ3S 3dUal0hGzWnS5jmYZbkC8tAdk67QANcIC0iLcC7bDjP8pt/tDIiOff+ON7TTbDdKrKaf /cUaFTjBWPFhhkgiWzkYtr/4wLZffXnaovcHCD8bVYXBPgRqc0LK9wWGiGrDkE3uiG8d umU4zGCmmPPPRuqrEnERmvgedJlAtxyp/bItbplLrfX8PppYj9z9ogn+9wJkQGMGVOgr ufpQ== 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=SF4g5yXo3DL85kbdFM7PkRMxKfciGx1udkwdiwlBdRo=; b=Lt1IVnXfFSTThAPLtqzq5aLkuqhq7MHNZFAlvtOq1mVJWx7rSh1YyrbeROpey3WOIH L7i64qRRXYDTpzT1yX/XClFHtowUfvllq6BwPEvTeSZTVlP+vUtHOZLFHfBcrjUZRxs+ m3wq9CNrdg6QpYppbBaODnK+D9jZexeTepoXaeKjP9oclBPVA1pezfTMs/p6BYUJoseY qO7E4XB07wBO8OhNgWVeCc6Nw4kmKSMR6NtoyVH90WPsy4ucvkwmmRxl5llCi77qfcO7 OEpnY3VT0a0RPLH25Xyc3iZgdbf661oKBeEXUEsrqOaiCdtvsmg4EukWI5tB8MVpUi9u tOTw== X-Gm-Message-State: AO0yUKWPUX6wOwQjC4ggeTPJTxKHRigv/RK7/Kfw5dZQzbxFJv++AJ3g IZEIYT279R4IDMtXULf5NDZjRw== X-Received: by 2002:a5d:410b:0:b0:2c5:8c56:42d3 with SMTP id l11-20020a5d410b000000b002c58c5642d3mr2728529wrp.23.1676972766819; Tue, 21 Feb 2023 01:46:06 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id i15-20020adffc0f000000b002c5691f13eesm4858759wrr.50.2023.02.21.01.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 568951FFC1; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= , Anders Roxell Subject: [PATCH v2 11/14] tests: add tuxrun baseline test to avocado Date: Tue, 21 Feb 2023 09:45:55 +0000 Message-Id: <20230221094558.2864616-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.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 TuxRun project (www.tuxrun.org) uses QEMU to run tests on a wide variety of kernel configurations on wide range of our emulated platforms. They publish a known good set of images at: https://storage.tuxboot.com/ to help with bisecting regressions in either the kernel, firmware or QEMU itself. The tests are pretty lightweight as they contain just a kernel with a minimal rootfs which boots a lot faster than most of the distros. In time they might be persuaded to version there known good baselines and we can then enable proper checksums. For a couple of tests we currently skip: - mips64, a regression against previous stable release - sh4, very unstable with intermittent oops Total run time: 340s (default) -> 890s (debug) Overall coverage rate (tested targets + disabled tests): lines......: 16.1% (126894 of 789848 lines) functions..: 20.6% (15954 of 77489 functions) branches...: 9.3% (40727 of 439365 branches) Signed-off-by: Alex Bennée Cc: Anders Roxell Acked-by: Thomas Huth --- v2 - renamed to tuxrun_baselines, update commit message - add remaining targets - add more metadata tags for the differences - refactor tag code - skip mips64 and sh4 tests in CI - slightly increase delay for login - include in MAINTAINERS --- MAINTAINERS | 1 + tests/avocado/tuxrun_baselines.py | 423 ++++++++++++++++++++++++++++++ 2 files changed, 424 insertions(+) create mode 100644 tests/avocado/tuxrun_baselines.py diff --git a/MAINTAINERS b/MAINTAINERS index 21595f0aad..d264f1d982 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3760,6 +3760,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ +F: tests/avocado/tuxrun_baselines.py F: scripts/archive-source.sh F: docs/devel/testing.rst W: https://gitlab.com/qemu-project/qemu/pipelines diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py new file mode 100644 index 0000000000..30aaefc1d3 --- /dev/null +++ b/tests/avocado/tuxrun_baselines.py @@ -0,0 +1,423 @@ +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from avocado import skip, skipIf +from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command, exec_command_and_wait_for_pattern +from avocado_qemu import wait_for_console_pattern +from avocado.utils import process +from avocado.utils.path import find_command + +class TuxRunBaselineTest(QemuSystemTest): + """ + :avocado: tags=accel:tcg + """ + + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0' + # Tests are ~10-40s, allow for --debug/--enable-gcov overhead + timeout = 100 + + def get_tag(self, tagname, default=None): + """ + Get the metadata tag or return the default. + """ + utag = self._get_unique_tag_val(tagname) + print(f"{tagname}/{default} -> {utag}") + if utag: + return utag + + return default + + def setUp(self): + super().setUp() + + # We need zstd for all the tuxrun tests + # See https://github.com/avocado-framework/avocado/issues/5609 + zstd = find_command('zstd', False) + if zstd is False: + self.cancel('Could not find "zstd", which is required to ' + 'decompress rootfs') + self.zstd = zstd + + # Process the TuxRun specific tags, most machines work with + # reasonable defaults but we sometimes need to tweak the + # config. To avoid open coding everything we store all these + # details in the metadata for each test. + + # The tuxboot tag matches the root directory + self.tuxboot = self.get_tag('tuxboot') + + # Most Linux's use ttyS0 for their serial port + self.console = self.get_tag('console', "ttyS0") + + # Does the machine shutdown QEMU nicely on "halt" + self.shutdown = self.get_tag('shutdown') + + # The name of the kernel Image file + self.image = self.get_tag('image', "Image") + + # The block device drive type + self.drive = self.get_tag('drive', "virtio-blk-device") + + self.root = self.get_tag('root', "vda") + + # Occasionally we need extra devices to hook things up + self.extradev = self.get_tag('extradev') + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + + def fetch_tuxrun_assets(self, dt=None): + """ + Fetch the TuxBoot assets. They are stored in a standard way so we + use the per-test tags to fetch details. + """ + base_url = f"https://storage.tuxboot.com/{self.tuxboot}/" + kernel_image = self.fetch_asset(base_url + self.image) + disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst") + + cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4" + process.run(cmd) + + if dt: + dtb = self.fetch_asset(base_url + dt) + else: + dtb = None + + return (kernel_image, self.workdir + "/rootfs.ext4", dtb) + + def prepare_run(self, kernel, disk, dtb=None, console_index=0): + """ + Setup to run and add the common parameters to the system + """ + self.vm.set_console(console_index=console_index) + + # all block devices are raw ext4's + blockdev = "driver=raw,file.driver=file," \ + + f"file.filename={disk},node-name=hd0" + + kcmd_line = self.KERNEL_COMMON_COMMAND_LINE + kcmd_line += f" root=/dev/{self.root}" + kcmd_line += f" console={self.console}" + + self.vm.add_args('-kernel', kernel, + '-append', kcmd_line, + '-blockdev', blockdev) + + # Sometimes we need extra devices attached + if self.extradev: + self.vm.add_args('-device', self.extradev) + + # Some machines already define a drive device + if self.drive != "none": + self.vm.add_args('-device', + f"{self.drive},drive=hd0") + + # Some machines need an explicit DTB + if dtb: + self.vm.add_args('-dtb', dtb) + + def run_tuxtest_tests(self, haltmsg): + """ + Wait for the system to boot up, wait for the login prompt and + then do a few things on the console. Trigger a shutdown and + wait to exit cleanly. + """ + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.2) + exec_command(self, 'root') + time.sleep(0.2) + exec_command(self, 'cat /proc/interrupts') + time.sleep(0.1) + exec_command(self, 'cat /proc/self/maps') + time.sleep(0.1) + exec_command(self, 'uname -a') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', haltmsg) + + # Wait for VM to shut down gracefully if it can + if self.shutdown == "nowait": + self.vm.shutdown() + else: + self.vm.wait() + + def common_tuxrun(self, dt=None, haltmsg="reboot: System halted", + console_index=0): + """ + Common path for LKFT tests. Unless we need to do something + special with the command line we can process most things using + the tag metadata. + """ + (kernel, disk, dtb) = self.fetch_tuxrun_assets(dt) + + self.prepare_run(kernel, disk, dtb, console_index) + self.vm.launch() + self.run_tuxtest_tests(haltmsg) + + # + # The tests themselves. The configuration is derived from how + # tuxrun invokes qemu (with minor tweaks like using -blockdev + # consistently). The tuxrun equivalent is something like: + # + # tuxrun --device qemu-{ARCH} \ + # --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE} + # + + def test_arm64(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64 + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_arm64be(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64be + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv5(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:arm926 + :avocado: tags=machine:versatilepb + :avocado: tags=tuxboot:armv5 + :avocado: tags=image:zImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(dt="versatile-pb.dtb") + + def test_armv7(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7 + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv7be(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7be + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_i386(self): + """ + :avocado: tags=arch:i386 + :avocado: tags=cpu:coreduo + :avocado: tags=machine:q35 + :avocado: tags=tuxboot:i386 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32(self): + """ + :avocado: tags=arch:mips + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=endian:big + :avocado: tags=tuxboot:mips32 + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32el(self): + """ + :avocado: tags=arch:mipsel + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=tuxboot:mips32el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + @skip("QEMU currently broken") # regression against stable QEMU + def test_mips64(self): + """ + :avocado: tags=arch:mips64 + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64 + :avocado: tags=endian:big + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips64el(self): + """ + :avocado: tags=arch:mips64el + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc32(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:ppce500 + :avocado: tags=cpu:e500mc + :avocado: tags=tuxboot:ppc32 + :avocado: tags=image:uImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc64(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=endian:big + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64 + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_ppc64le(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64le + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_riscv32(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv32 + """ + self.common_tuxrun() + + def test_riscv64(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv64 + """ + self.common_tuxrun() + + def test_s390(self): + """ + :avocado: tags=arch:s390x + :avocado: tags=endian:big + :avocado: tags=tuxboot:s390 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-ccw + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(haltmsg="Requesting system halt") + + # Note: some segfaults caused by unaligned userspace access + @skipIf(os.getenv('GITLAB_CI'), 'Skipping unstable test on GitLab') + def test_sh4(self): + """ + :avocado: tags=arch:sh4 + :avocado: tags=machine:r2d + :avocado: tags=cpu:sh7785 + :avocado: tags=tuxboot:sh4 + :avocado: tags=image:zImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=console:ttySC1 + """ + # The test is currently too unstable to do much in userspace + # so we skip common_tuxrun and do a minimal boot and shutdown. + (kernel, disk, dtb) = self.fetch_tuxrun_assets() + + # the console comes on the second serial port + self.prepare_run(kernel, disk, console_index=1) + self.vm.launch() + + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.1) + exec_command(self, 'root') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', + "reboot: System halted") + + def test_sparc64(self): + """ + :avocado: tags=arch:sparc64 + :avocado: tags=tuxboot:sparc64 + :avocado: tags=image:vmlinux + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_x86_64(self): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:q35 + :avocado: tags=cpu:Nehalem + :avocado: tags=tuxboot:x86_64 + :avocado: tags=image:bzImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() From patchwork Tue Feb 21 09:45:56 2023 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: 655367 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1869771wrc; Tue, 21 Feb 2023 01:50:19 -0800 (PST) X-Google-Smtp-Source: AK7set/UGPIbV2cSwQAN6QxEdcnrK4hjtvITySnh5QqQ31sjacH57IEST5W4qF5v0Am6lWGkios+ X-Received: by 2002:ad4:5dc3:0:b0:56e:a899:1604 with SMTP id m3-20020ad45dc3000000b0056ea8991604mr10624236qvh.14.1676973019174; Tue, 21 Feb 2023 01:50:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676973019; cv=none; d=google.com; s=arc-20160816; b=M0EIyPig9WIDquStm+x2+xmZns7DiuQ6PjMVSqBVyL3iZLHoAqNhRBAiY3xiZ5NmIt 9CKFkrkzlNwk3eqYyvypdSqIesgHTOhDP76uok30RBGBCj2Ft1sU7v1sCTqmI4HHeHsJ OB71IVJ2EScPNe68l/IP5sV9uidjgg+kbPRPYyvwFRgC+pxOnucdb8uR45PPsphRMHkm BzHFYzUWk5gjHQ/VLB9VxNmyh7kB1HYH5AVEwFHbL5jdnAvfT3TgibELhZPiYDXHAo7K TVU+/EjZUzaeZxUXfUI/8UqSnFN36JGb/8ANVCo6JLgH+BKsNbanJUy0N1NxSeI3cUqI 6ciA== 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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=oMDvshVXKDYUMEN2IzgFW92IEjWgmqo9xxJRUvHpRdjgS5MGeaC/L0amGrBmkgfxGM 3Zb6IrtQDGUMgQj7ddWAhl1IaCCnwkB5Hw+4E+Vk1keMdVWXSscxuraTCXnHIJQLaEKd RKtO+3TCN7SG7yuzu5CXtG1PI/KJ3GHY6BDdkhXjwZ7hvZD5m8qCyKeGpinKDcxgTT4M IwOUomLL+hh6N+QBl6QTfWpuzghKpnxHwOwizoK+kSKrJsNDmpKeO1EcDxxo5AGh0MyZ U2StfM1dMNEQXLegQ7v2jwfGkF8ZFk6fZz389xq/29XUfmxKwtfhd4+Yw2KymZY4dTNS mjBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=J5h8kjwW; 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 b1-20020a0cf041000000b0056bf764c63fsi3611723qvl.283.2023.02.21.01.50.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:50: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=J5h8kjwW; 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 1pUPE8-0006lU-FF; Tue, 21 Feb 2023 04:46: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 1pUPDx-0006Z1-Sy for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:14 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDq-0005l4-Kn for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:13 -0500 Received: by mail-wr1-x434.google.com with SMTP id bo30so3151221wrb.0 for ; Tue, 21 Feb 2023 01:46:06 -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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=J5h8kjwW/iWGZuqekQXR0ZmQg1orMIMAlxi+jQGwkXbRgcoCYs7MroysKOqYb4hxOP t95+zuXRs+buvQI6HeVWgTDCzbICOoI7jMguLomueMzjnFQWBDwFb60FkxJemXiUTBA8 lkTk7c+ORBkwxftef0igkUDifoZii5O8HEezpGILulyrmrWCZn9PQk6GcZ9k8595wq8i BL/MeGhzAgeeoswy5b88SZ6emS6zBYiAGEYi0S9+Mo+gxECHVJPuUivrppbnE3RQ9GOr HP4Pa3TFa2O39/nuGxtKrxDw3EYqO9VW8OO8Cde6TeQ4Mx46G0cWi6WTbt4p1B16CmO6 WPJw== 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=i1ygqzeQVGCuPcwoBCSUGziqmUHDcFPufoB7wqrTRgA=; b=7JKuhP6R7Tt3+oMK2cMQQcF+WAtAma8mBDPoo51gJ5dr1aRbxbEga6YlaorF6062e8 16h9/bs/q3Pfeki8t1u92skpKy2N1vs5L4NsR5zd2UEAtki2mxLLpg6wo8+tsAlP0PVi G/FH9h9yneR7AFo+B/EvOTMKjvRjJyjyimMlI4JwNDffOT5m8UejQ/p5fiQq/XolLfW5 6sZeJeNJ62oThH8MmZOFOWqtOVb8LTPIxuBNcGt6kuMD0VIRd8qQI/Zu66kchx7TphDn /HNYVJnrxyJBhnxb9HGpd335t9oo5SybI0Qs3FqrztRC64OXA+44vVSh7wHyguGI9W8D 229A== X-Gm-Message-State: AO0yUKUz9xBNSnIYeSzFfaFDq9fv0QyW+0n8YdGyc5XfNGx7jj/sHoiT QKYgOz8HDPZjZ8kffNPWrhyzHw== X-Received: by 2002:adf:f2c6:0:b0:2c5:5fc7:2862 with SMTP id d6-20020adff2c6000000b002c55fc72862mr3493319wrp.69.1676972765278; Tue, 21 Feb 2023 01:46:05 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t13-20020a05600001cd00b002c6d0462163sm2758868wrx.100.2023.02.21.01.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 742BE1FFC2; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 12/14] tests/docker: Use binaries for debian-tricore-cross Date: Tue, 21 Feb 2023 09:45:56 +0000 Message-Id: <20230221094558.2864616-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Bastian Koppelmann since binutils is pretty old, it fails our CI repeatedly during the compilation of tricore-binutils. We created a precompiled version using the debian docker image and download it instead of building it ourself. We also updated the package to include a newer version of binutils, gcc, and newlib. The default TriCore ISA version used by tricore-as changed from the old version, so we have to specify it now. If we don't 'test_fadd' fails with 'unknown opcode'. The new assembler also picks a new encoding in ld.h which fails the 'test_ld_h' test. We fix that by using the newest TriCore CPU for QEMU. The old assembler accepted an extra ')' in 'test_imask'. The new one does not, so lets remove it. Signed-off-by: Bastian Koppelmann Message-Id: <20230209145812.46730-1-kbastian@mail.uni-paderborn.de> Signed-off-by: Alex Bennée --- tests/tcg/tricore/macros.h | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 10 +++------- tests/tcg/tricore/Makefile.softmmu-target | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index ec4f5bff52..3df2e0de82 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -174,7 +174,7 @@ test_ ## num: \ TEST_CASE_E(num, res_lo, res_hi, \ LI(DREG_RS1, rs1); \ rstv; \ - insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2); \ + insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2; \ ) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 5ae58efa09..82e4576485 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ bzip2 \ ca-certificates \ ccache \ + curl \ flex \ g++ \ gcc \ @@ -34,13 +35,8 @@ RUN apt update && \ python3-setuptools \ python3-wheel -RUN git clone --single-branch \ - https://github.com/bkoppelmann/tricore-binutils.git \ - /usr/src/binutils && \ - cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ - make && make install && \ - rm -rf /usr/src/binutils +RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ + | tar -xzC /usr/local/ # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index d2446af8b4..b3cd56fffc 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -1,7 +1,7 @@ TESTS_PATH = $(SRC_PATH)/tests/tcg/tricore -LDFLAGS = -T$(TESTS_PATH)/link.ld -ASFLAGS = +LDFLAGS = -T$(TESTS_PATH)/link.ld --mcpu=tc162 +ASFLAGS = -mtc162 TESTS += test_abs.tst TESTS += test_bmerge.tst @@ -19,7 +19,7 @@ TESTS += test_madd.tst TESTS += test_msub.tst TESTS += test_muls.tst -QEMU_OPTS += -M tricore_testboard -nographic -kernel +QEMU_OPTS += -M tricore_testboard -cpu tc27x -nographic -kernel %.pS: $(TESTS_PATH)/%.S $(HOST_CC) -E -o $@ $< From patchwork Tue Feb 21 09:45:57 2023 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: 655362 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1868985wrc; Tue, 21 Feb 2023 01:47:38 -0800 (PST) X-Google-Smtp-Source: AK7set/NyMxwpxdkiD3qcSgLP8z5/PTBRbWvORfJG1sFxQpJsp/IV1AiEox7d6AtoxNTZj8zmas4 X-Received: by 2002:a05:6214:f2d:b0:56b:4e51:acd5 with SMTP id iw13-20020a0562140f2d00b0056b4e51acd5mr10831984qvb.12.1676972858355; Tue, 21 Feb 2023 01:47:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676972858; cv=none; d=google.com; s=arc-20160816; b=MBMBXfHTnIpP2E5T5VBxQ+iAvaNVkc5TwdxjgIr8UHgKWGMvaJrcS3JIrLnO+q5+vg 2gDNZ0oYp/y3KKW/lRSAADOahYO+f7pVPiAr5SzJuhR0Jn/oLqGWgjZhM7qdjZWeUPW+ sUjwq6IR0gz3hMT9YP6UGDw3vNhRJGu4TcwP6bbeQBBf/uz0HSzMfvYyDnyjwTuHbXbz ZqQLrrfMbkFlQIdGMbd1aeeVb4e9ZkrsZgJ0gqarFncF76ZonQKL9PRWOE3b1oIzLKTK zilntJ5h9izczXAz10DTLdKlvd1HL7TwBEbCaJu/LhL44HtQ3pMGMjhTRam/d/Kd/rSf dFSg== 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=HrkxQ4C8k4Tf9raZcUSEIFG81EdtIwTYG8FkdkShoug=; b=muoRIKMpiX6O+xVYEwS34zYapr1PLxigaDLcmulEGHnv08XJEX2DqCaE1f1mh4OuQE lfDkX4joK0S+Qi5JCijNgOmi+aUXpJRsyJj11f3kS4U3mwQDykRGnMk3QAgY4YmysV7k 7c63FI2tjkNNQdwTgzzbm3BJ0/sR4sPoqbOxazquKuYjYT6OptetCG0N2M/Z7s6LuTlW xQGLerqZM3ld9hAqwPGPC7XGnp7y7Ewxu8PTM2LOPycZeDmcNvwJ4a2lDsLoRcqGK0oJ GK1bY0zZafDtzGOry30A1zp8Wd+nBWQD52F4Qeq7c68JNgC38gsoxwdJA1V4eigJxwau wHrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OA0ew+Xl; 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 q6-20020a0c8cc6000000b0056e97f3d1b0si11154189qvb.59.2023.02.21.01.47.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:47:38 -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=OA0ew+Xl; 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 1pUPEB-0006oL-5Y; Tue, 21 Feb 2023 04:46:27 -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 1pUPDy-0006Zq-N2 for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:15 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDs-0005lg-0f for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:14 -0500 Received: by mail-wr1-x42a.google.com with SMTP id p8so3840754wrt.12 for ; Tue, 21 Feb 2023 01:46:07 -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=HrkxQ4C8k4Tf9raZcUSEIFG81EdtIwTYG8FkdkShoug=; b=OA0ew+Xl2SPqL6tHjc/p7983chG8UO+pwRXwW/gWbT/u5iW4Ke9ifraMKY3yjsoL5t lL865P7ikBD4RzepmOt1ucSgPt/yg/fHFD6nT8Id9VsUOpKN4riuDINi/CYcQBqojUMj iyb4aG+/nktaZy8r5rWwG/LpQMH9iKCB2giEaqYOZPKMZGkKfPJQ3PThFRIvVfKi0H/s 9TGabpsk/KV4V7Sp7XzZX/C5l/h5hoWrXj5ZzLDhNSwWPg6CMM5EejzUo1Ejqlj5FzTz di2aW/M61XqcxeOxmIY/xplY2Q0nI9HZbLLwjcMnAGI1J+QOdb1ChPVsCaPI+hB2gH4j iFJg== 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=HrkxQ4C8k4Tf9raZcUSEIFG81EdtIwTYG8FkdkShoug=; b=oRBzTvep6b220yMFAHYfFrMT71+j7ck2x6qXrcxz8s08pOYd8LVmElWcmllb91YOaF edr38VN9EIJim3tAo5iAXbJiThNTboVkfabkeHIUNdiF7nncFdUhmvXQxO42V6VMTf5J EHe0s+rbzkqxzRRS0cUs6jSfTYUDzriwTZfZkTPc+KIJCC2EJn4Cd4cKMFbq2wTb7mG0 wfyDxNqb2AL0+NrDon4NGX3hfmqDcQ3+qrlryMeExaioWHqBGLQg629kPwbb197tPVzV xAeZriA1FsZvzYrYbsY6ORtQ/qYL0gHv77xCjKK59hYF7PUrlLOaV3hozJWzgRA9L0Vk d2PQ== X-Gm-Message-State: AO0yUKU1GgHywFdtyFR8IzE94VBW3JMtH6KFfYNUJbH1hl5peICmBJzk 8YZ+BDSW6ByG2yaDJHq0hyNoRA== X-Received: by 2002:adf:dfd0:0:b0:2bf:f735:1310 with SMTP id q16-20020adfdfd0000000b002bff7351310mr3548320wrn.2.1676972766191; Tue, 21 Feb 2023 01:46:06 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id j9-20020adff009000000b002c3ea5ebc73sm4712403wro.101.2023.02.21.01.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9020A1FFC3; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 13/14] tests: ensure we export job results for some cross builds Date: Tue, 21 Feb 2023 09:45:57 +0000 Message-Id: <20230221094558.2864616-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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 We do run tests on some cross builds. Provide a template to ensure we export the testlog to the build artefacts and report the test results via the junit. Signed-off-by: Alex Bennée Reported-by: Peter Maydell Reviewed-by: Thomas Huth --- v2 - properly format extends --- .gitlab-ci.d/crossbuild-template.yml | 11 +++++++++++ .gitlab-ci.d/crossbuilds.yml | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 6d709628f1..24a41a7b21 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -48,3 +48,14 @@ nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user xtensa-linux-user $CROSS_SKIP_TARGETS" - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS + +# We can still run some tests on some of our cross build jobs. They can add this +# template to their extends to save the build logs and test results +.cross_test_artifacts: + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + expire_in: 7 days + paths: + - build/meson-logs/testlog.txt + reports: + junit: build/meson-logs/testlog.junit.xml diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 74d6259b90..bbc013725c 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -44,7 +44,9 @@ cross-arm64-user: IMAGE: debian-arm64-cross cross-i386-system: - extends: .cross_system_build_job + extends: + - .cross_system_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -52,7 +54,9 @@ cross-i386-system: MAKE_CHECK_ARGS: check-qtest cross-i386-user: - extends: .cross_user_build_job + extends: + - .cross_user_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -60,7 +64,9 @@ cross-i386-user: MAKE_CHECK_ARGS: check cross-i386-tci: - extends: .cross_accel_build_job + extends: + - .cross_accel_build_job + - .cross_test_artifacts timeout: 60m needs: job: i386-fedora-cross-container From patchwork Tue Feb 21 09:45:58 2023 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: 655369 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1870072wrc; Tue, 21 Feb 2023 01:51:05 -0800 (PST) X-Google-Smtp-Source: AK7set/CUvC7Vq5kBBY55Weh3eLWB49xO2U2s0RCHXgPXPkH3x/WqlXwuqdAApFsu69TkWNkZsMf X-Received: by 2002:ac8:5896:0:b0:3b6:3f4a:8154 with SMTP id t22-20020ac85896000000b003b63f4a8154mr22542723qta.65.1676973065467; Tue, 21 Feb 2023 01:51:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676973065; cv=none; d=google.com; s=arc-20160816; b=n+pxwQRm9Znw6WwWeuMtImR5lDzF2mIkwoVeYldviqc29cPBqeTX9xcdmi5gnmr/rF AIn9I8JEIeNJaQZDUOgs9roXU8puRbt+/QOKAOnl0VvLI9UBTiVlg3DxWIqVy/zaiPEs /7gqoH8HrWn/b/XrfaqQ0pP1e0nakva4mfyYWWomAMRILgLNoiEBLQbQVGGr5HNKWGPo KsabDAm/qoSoK72HwF0fNU6ZUXW7xdc+hlZ6kkJbrBgWa7w0IO0A/mizTu/HkixKoonF GM7ttbTZ5RSXn0SiseZhdVE1YCcSPEBu7opHE1m1PyopIYChnKwuWJU7m3MlG5MfOqeX 7+bQ== 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=RPAcXxshM3oIDV7Nd8qDMhK+ewSzYoeyH2TxIrPviEw=; b=ayW5Zv1JasqonGfBfRFoqwR5R0GpOzMyCKZBsqMvppLgsx9rJ5c/xqhpPX7Pl3xwo6 S3hWv6rgNvp2wCixFFko4tnp6cFq4p7yU2vJOxhElCer0T1TK2P8YIvoPS519JoJIJa5 KVU9IBpD1CZB12jlFUJqSJRN+H3HkGqBBzbLsXLTZxHCLQZI/J5/e2UdSM73JaxNuDVr YnNeO9DASJ0B0GrBSEOCV0u58B6CRXAXxF2R9RXQV255H6AdW4wiiwa/aga4EZPca9CE dl85BR73qJr4oLWwOTKDyt5IJF3aeOXB1HZRFbbInIL1Z42voFL1Dh+8wMcptgeJoaqL r1Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nDDpKX7O; 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 c18-20020a05622a059200b003b9b6ab38f3si587638qtb.441.2023.02.21.01.51.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Feb 2023 01:51:05 -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=nDDpKX7O; 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 1pUPEA-0006n2-2s; Tue, 21 Feb 2023 04:46: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 1pUPDx-0006Z0-SB for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:15 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pUPDs-0005lU-0m for qemu-devel@nongnu.org; Tue, 21 Feb 2023 04:46:13 -0500 Received: by mail-wm1-x32a.google.com with SMTP id bg37-20020a05600c3ca500b003e21e018039so3824894wmb.3 for ; Tue, 21 Feb 2023 01:46:06 -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=RPAcXxshM3oIDV7Nd8qDMhK+ewSzYoeyH2TxIrPviEw=; b=nDDpKX7O37ZhKxq0rO5B49V6cYsVebxr3yEkMRZAAumAVOK1dVqmZJnsX0sj0yL6Va 5VwpSPPVoeo+SpjrlwzxzmMzyCKN9ucBhJ6W5c1oOG4wd/4IMQOPyKkAJ4bLI5SeGyC2 x1E6p7cD8hIJqyogKZJGN/s3poGeBmONVWZHqx2ErsK8vWdrHVtIDfwjw6KYAQ3LxBCe KgycJxyu9IwyGdtUZ7dVOUHxrUIRJRYMkiFmCnWW/3LnauPodpyEXHu8wPp2zdtqfBIu aRZxEWQsB0+XXs15gw6Zq83CecfL2uB26n1Vxq4F/ct6BEVKoglk5pJhacfY+aqZ0Qbs vm7w== 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=RPAcXxshM3oIDV7Nd8qDMhK+ewSzYoeyH2TxIrPviEw=; b=LHH28e9jpjBY31zqPz2ueQnrCJRkqz2ylDdKFO64CbT8swAmpFf6nx1iQpqA2McYOu murzSI4Qcq9UGUtVGBjmKTVa1spg6vizxneCWwt60VZ4e6zymt8Oh0xU6qNxVOGyCnY7 OpzbcvrPnzuLSzwQNoLleBYWXT+jmkrwNcw0VBdI5NYgxuGjFnaBJiDHyt3/7WULHhmD HULQEOGSas3zmEwzoHnSBRmIoHms6XKFgDMXkU4AE76Jch8/BlLNgNk8PgcjNJmdKKzp JvxUpHso5eDMqhLrT8AnxBeFU9DJS3DtXgMT3Vc1MV1DSYAXk6l8+cyYc7V07yslpxLL IbkQ== X-Gm-Message-State: AO0yUKWEji/Yd9h/5Cf71hxQfcfMzoR+AOgNQst3GRa6uLledeegVHLa brYDjdrAZWN0uxxLhCYkuqzHLA== X-Received: by 2002:a05:600c:2b46:b0:3e0:14a:697a with SMTP id e6-20020a05600c2b4600b003e0014a697amr3347585wmf.6.1676972765916; Tue, 21 Feb 2023 01:46:05 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id hn29-20020a05600ca39d00b003db03725e86sm4137663wmb.8.2023.02.21.01.46.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Feb 2023 01:46:03 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A7CD41FFC4; Tue, 21 Feb 2023 09:46:00 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Markus Armbruster , Peter Maydell , Yonggang Luo , Li-Wen Hsu , Paolo Bonzini , Thomas Huth , Ed Maste , Bandan Das , Cleber Rosa , Qiuhao Li , qemu-block@nongnu.org, Beraldo Leal , Hanna Reitz , qemu-arm@nongnu.org, Michael Roth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Pavel Dovgalyuk , Alexander Bulekov , Darren Kenny , Aurelien Jarno , Bastian Koppelmann , Wainer dos Santos Moschetta , Stefan Hajnoczi , Kevin Wolf , John Snow , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Daniel_P?= =?utf-8?q?=2E_Berrang=C3=A9?= Subject: [PATCH v2 14/14] cirrus.yml: Improve the windows_msys2_task Date: Tue, 21 Feb 2023 09:45:58 +0000 Message-Id: <20230221094558.2864616-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230221094558.2864616-1-alex.bennee@linaro.org> References: <20230221094558.2864616-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 There's no need to run a full-blown bash just to create a directory. And we can skip the "cd build" each time by doing it once at the beginning. Additionally, let's exclude some targets (that we already compile-test with MinGW in the gitlab jobs) from the build, since the build time of this task is very long already (between 80 and 90 minutes). Signed-off-by: Thomas Huth Message-Id: <20230208103046.618154-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- .cirrus.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4895987da4..5fb00da73d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -100,9 +100,11 @@ windows_msys2_task: tar xf C:\tools\archive\msys64.tar Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))" script: - - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" + - mkdir build + - cd build + - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3 + --target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu" + - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8" - exit $LastExitCode test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"