From patchwork Thu May 27 16:03:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448860 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp642296jac; Thu, 27 May 2021 09:07:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwhhDnye2u5iTxbpaOc1Q0Yym0bG30Mk1mCsO1zUfOUXHMnGlrDaMzwwTLUOrdgeYSMhe8G X-Received: by 2002:a05:6402:2788:: with SMTP id b8mr4828555ede.335.1622131669829; Thu, 27 May 2021 09:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131669; cv=none; d=google.com; s=arc-20160816; b=HOu6hzBU81GwamtwtuYaWP2cVcBnskNZ3xAnEk7+Uc2V0Ao2SXZ3mf0rpmZT1kg8oO x4EvZpN7URQ8aT1Qx5bO9szsSqDvddYNk7zp/sFUEVB1M+Gr7I9MXfc8Y3nrVyZt3IPi lWFB8PzZNYTzOGJsFphqYId3PkUr/Gzhpe4fBCgQ8N8uvQXcyX2Nf8YikpoSqqxjLmRu dnkkACkDeRFf+AUpmeg3lnauLWWBUSsEHamDVHy+CcS9zzs+7wczMMog0uQi6VPZAwjD bfR2ql559VVuhsGR5WFnKn9rAWbqLEQZ3Ew8B/yVOQT1lxzMKKa2swQTs6X60BaMuiEW GjKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=mz6OklwamQYvc3w9qT/mb2Gq27rR9WEvelWLrLCdxIU=; b=imFqFFzLtqGwHns2WEydTDJG0rlp4ObYtnmKwXqiOYZ2dXl5SsqICVGts63veQTONb ENaMBK5tRwAyWC1ij74r8xvE++nCSufei6HK7HroT+CNN7SFp4VhtVj6SNU8klp1ziqN BD+Ku8HAcW3O+Ns3dZMiDHduyOD64SrDUKK+fTXEIMN3jnrxbgCn/q8okq4J24JTHP// qhlXAHNoku7o6DppRoHVlbhbAeUqSJqZkrYmG/5+WJpo/D0PGUs9g/t37jj7lQ0II7qS sk15f9xDWnHOhy2SsMVF0rL8bi8lsLbVcxBsrE9Ui1hqNM3HljMh6jy/i9FyMelgsDuL 7tbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DDyr73q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hs26si2376891ejc.307.2021.05.27.09.07.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:07:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DDyr73q5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIY0-00016r-Mi for patch@linaro.org; Thu, 27 May 2021 12:07:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITm-0004oS-4p for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:26 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:34592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITj-0000K7-59 for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:25 -0400 Received: by mail-wr1-x42f.google.com with SMTP id f11so447780wrq.1 for ; Thu, 27 May 2021 09:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mz6OklwamQYvc3w9qT/mb2Gq27rR9WEvelWLrLCdxIU=; b=DDyr73q5RF9tSkYzgnJ1Vsu6kGSMgMDCJ1aCx4v/NuqUBSpRmKnWZtXODuAikntoOU a/RgEobt2PVJmhwWx4hk6fyzpfT+jO3QWbUB0KUfDXmMYx7jRfR690LnvociD37ZJ/KC V90PidXJZZRvqepL535ndpwaYFMiqBYgccUuT8WW5ZzZloDGXHH+RDZIDSF1Wo9wm11p 97eWE9u+9hYFR85Cbs4kZgXmPID7TaQQ1y6H/dlVDKHQlrPQYSiNTwrxYwgQk9Vj6ClS rL++Z36XVuO7qZ52rtafvVMRPR1Cd3VvaqNji8lMT813/huh219LSU+uL6QnSWUbaIuA U/EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mz6OklwamQYvc3w9qT/mb2Gq27rR9WEvelWLrLCdxIU=; b=niRsG2blB8+2ousZ9oJX1uEUS79glaRSxdMi+ffUaOGH2WDwi5ujGAvpUv/wZW2m+a nrFBRI+VWoOyC6+GC3Ffi4ZUMIJIBRd5C4J2VG4PdtzZrxLDmC+KY1E7zw5lML+qusMm prtNRGi6FCSlpxH14Jb1qSDqMY3RyQ9JVahU+CU24Etog1KebXnaIHYcpV1IsLno0kBN vDJSKCcnlrEa1qjWZRh23zD/Tp/9tXLyGa0JwlZXGGXqpGDABQilWE2uLTsHSIj0Odq9 mnB8uS5itgqjVl0VWvfr5q4GvBZ1NzNiKJ2v4qqza7RodgHRbWd3RPMIVK1hpaHBMU+Q lOOA== X-Gm-Message-State: AOAM5309C+K9xs2qCoWMgWbeDUHDJVj4rz4TIR21vRxrwA/aA6gwGlnN qyNHkByCXLWDKzlRfrY38qEwAQ== X-Received: by 2002:a5d:4151:: with SMTP id c17mr4224079wrq.262.1622131401270; Thu, 27 May 2021 09:03:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s11sm11354478wmf.14.2021.05.27.09.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B4251FF87; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/6] tests/tcg: add a multiarch signals test to stress test signal delivery Date: Thu, 27 May 2021 17:03:14 +0100 Message-Id: <20210527160319.19834-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This adds a simple signal test that combines the POSIX timer_create with signal delivery across multiple threads. The aim is to provide a bit more of a stress test to flush out signal handling issues for easily than the occasional random crash we sometimes see in linux-test or threadcount. [AJB: this is still triggering intermittent failures in some guests so will probably be kept out of PRs until that is fixed.] Signed-off-by: Alex Bennée Message-Id: <20210504100223.25427-29-alex.bennee@linaro.org> --- tests/tcg/multiarch/signals.c | 149 ++++++++++++++++++++++++++++ tests/tcg/multiarch/Makefile.target | 2 + 2 files changed, 151 insertions(+) create mode 100644 tests/tcg/multiarch/signals.c -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/tests/tcg/multiarch/signals.c b/tests/tcg/multiarch/signals.c new file mode 100644 index 0000000000..998c8fdefd --- /dev/null +++ b/tests/tcg/multiarch/signals.c @@ -0,0 +1,149 @@ +/* + * linux-user signal handling tests. + * + * Copyright (c) 2021 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void error1(const char *filename, int line, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d: ", filename, line); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + exit(1); +} + +static int __chk_error(const char *filename, int line, int ret) +{ + if (ret < 0) { + error1(filename, line, "%m (ret=%d, errno=%d/%s)", + ret, errno, strerror(errno)); + } + return ret; +} + +#define error(fmt, ...) error1(__FILE__, __LINE__, fmt, ## __VA_ARGS__) + +#define chk_error(ret) __chk_error(__FILE__, __LINE__, (ret)) + +/* + * Thread handling + */ +typedef struct ThreadJob ThreadJob; + +struct ThreadJob { + int number; + int sleep; + int count; +}; + +static pthread_t *threads; +static int max_threads = 10; +__thread int signal_count; +int total_signal_count; + +static void *background_thread_func(void *arg) +{ + ThreadJob *job = (ThreadJob *) arg; + + printf("thread%d: started\n", job->number); + while (total_signal_count < job->count) { + usleep(job->sleep); + } + printf("thread%d: saw %d alarms from %d\n", job->number, + signal_count, total_signal_count); + return NULL; +} + +static void spawn_threads(void) +{ + int i; + threads = calloc(sizeof(pthread_t), max_threads); + + for (i = 0; i < max_threads; i++) { + ThreadJob *job = calloc(sizeof(ThreadJob), 1); + job->number = i; + job->sleep = i * 1000; + job->count = i * 100; + pthread_create(threads + i, NULL, background_thread_func, job); + } +} + +static void close_threads(void) +{ + int i; + for (i = 0; i < max_threads; i++) { + pthread_join(threads[i], NULL); + } + free(threads); + threads = NULL; +} + +static void sig_alarm(int sig, siginfo_t *info, void *puc) +{ + if (sig != SIGRTMIN) { + error("unexpected signal"); + } + signal_count++; + __atomic_fetch_add(&total_signal_count, 1, __ATOMIC_SEQ_CST); +} + +static void test_signals(void) +{ + struct sigaction act; + struct itimerspec it; + timer_t tid; + struct sigevent sev; + + /* Set up SIG handler */ + act.sa_sigaction = sig_alarm; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_SIGINFO; + chk_error(sigaction(SIGRTMIN, &act, NULL)); + + /* Create POSIX timer */ + sev.sigev_notify = SIGEV_SIGNAL; + sev.sigev_signo = SIGRTMIN; + sev.sigev_value.sival_ptr = &tid; + chk_error(timer_create(CLOCK_REALTIME, &sev, &tid)); + + it.it_interval.tv_sec = 0; + it.it_interval.tv_nsec = 1000000; + it.it_value.tv_sec = 0; + it.it_value.tv_nsec = 1000000; + chk_error(timer_settime(tid, 0, &it, NULL)); + + spawn_threads(); + + do { + usleep(1000); + } while (total_signal_count < 2000); + + printf("shutting down after: %d signals\n", total_signal_count); + + close_threads(); + + chk_error(timer_delete(tid)); +} + +int main(int argc, char **argv) +{ + test_signals(); + return 0; +} diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target index a3a751723d..3f283eabe6 100644 --- a/tests/tcg/multiarch/Makefile.target +++ b/tests/tcg/multiarch/Makefile.target @@ -30,6 +30,8 @@ testthread: LDFLAGS+=-lpthread threadcount: LDFLAGS+=-lpthread +signals: LDFLAGS+=-lrt -lpthread + # We define the runner for test-mmap after the individual # architectures have defined their supported pages sizes. If no # additional page sizes are defined we only run the default test. From patchwork Thu May 27 16:03:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448859 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp641939jac; Thu, 27 May 2021 09:07:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsCyBV3n3dwAopgVE/mp0BdbvjOFtl0EUbNiCLjfklHaA9OE1XtGhZtFj+too9R9LuEb6C X-Received: by 2002:a1c:7707:: with SMTP id t7mr4303861wmi.176.1622131650742; Thu, 27 May 2021 09:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131650; cv=none; d=google.com; s=arc-20160816; b=bdxnZWnxGe3fKJQPQ9/Sen0f3tH8CmTTh/cIr22/9vFEbZDvsdyZA4b3hM2f32yaHo 2jSaTSUL7sS4qd6Ft/lK7SzGMi6GhT4snjquoHquK46aJ/j9o5JB4ohLzDQJc3F6zGLD jTE0vo87F6j34K6gR0F2lfjhVgan+0a6/lQ9DDbMOJx2viiUukfabtspQRkvVWr2Mt4x mvKG6eKlPxvetZCqNNxRAcuFGwEZzpWfsnhjDpVibWtCxAk5XvLlY8kivV4LTVbz/Apc jkUMkDGvvO+CGvBlk/Ke7qXNjLhhLHPkcCoWSWqDfHoOAsGE3IBR4oj/kLv24HEGAlvR tI7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=NjUsaCVXvZBOoWNsWBWBwAfBbFCztzsGLeZKy47lhbY=; b=mcRUZEDJdZpsrSm20zGNOEumwaZ7ePgkaAnjzktiXLcCVt0BWZs3UsGv2JDRJdzyoc pkJCxAKreysJ/KghrpSutxaiasTWhaHitHxReMQcYT532B5u4MGFkp7A+uLYxIUtylSg +Ph8yuxgOjZn+qiJDITYtCVC0auSy5S+5Ia1uS6ngwwVNwnuj0sY8BMyxPLv0EJI5THm tUJHBDGL1Yu4Jc7h1dyb96KPXtfDBV3rG4JinHjGdenqd8remPSp79zxx/tlB4YX2sbG u9hnkdUnqbI1Q2KlETpjKx9c2H22UYpHb8Mljvop5yVkxPzyIv69ZzMw2I3CN0ydp9fL sp6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LtFo2qy6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p9si648687edi.403.2021.05.27.09.07.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:07:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LtFo2qy6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIXh-0001ve-Qp for patch@linaro.org; Thu, 27 May 2021 12:07:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITm-0004mu-0a for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:26 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:39731) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITj-0000Kk-DO for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:25 -0400 Received: by mail-wm1-x32f.google.com with SMTP id l18-20020a1ced120000b029014c1adff1edso2919312wmh.4 for ; Thu, 27 May 2021 09:03:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NjUsaCVXvZBOoWNsWBWBwAfBbFCztzsGLeZKy47lhbY=; b=LtFo2qy63ju3qGaabFsIBUP6GQtGwZWclwkIOeZd23H/r1JrOIjggwxx00xZ8iRXPa njJ67IeQ7igTZAIz9dCuZ+Cd+OWiPlhV5e6ZlDS0NHcq33SmfXqf+SlP8Roo6UabNSsI WfUUS7rpLPVnqSLiQ4L3e8OHP3iLmr0XLFjcGcVAlz3RtXtRPIuet3wfRQHvZBSQcs2Y qxaU5PMvdXTUHT/YY9PSNzj4pvWwueEIP8vKthh1vHIab/HFplZzpyqH0fsA/iZA4dBh uHXuub9RzZGnUMSt2aS08rAZH58T6r6+a+/Pq7m9e8JLK+6VXQygKWgoFRrzzy0t8CJd bpNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NjUsaCVXvZBOoWNsWBWBwAfBbFCztzsGLeZKy47lhbY=; b=SaqwdYoZps/zZMor4x1F4nT9QyqxColDHBX9rDHYx5ShczFCsZoxv1oIPDrXk1rA4l 3yF4IvkNxIIL+/Sh6KaeRezWkkx1Z8ZIotuPwt63bY8o8/GM9YS9XixgtvOtPh+QFBfW KYcBT3OKwmbjkakqIMhZuFDfGv1fDbvL+WEoBq6LMAQ5PWPJVMcxGQfdpccJn/imEtRg d3UcEuXKAwbZyJbeyw+fZyS3sSkFHW/PHFVUvXhiBmp2QUvmtsOK1RWMqnoPpI8dOGTC aGIKCZKZXiFLR1XCFyAzmm3pj6l6CBkFBj+qEV0BwQwkQnI1rDQ9M3OT6Gs2e4UWTeft MaYw== X-Gm-Message-State: AOAM532eIme7dmUZmcO/x9HDX0GywdEx1JdRfP2EBfrU0QNt1LbLJ+r9 8a0phezOOiD6ueRG6u4ZLk/4PQ== X-Received: by 2002:a1c:e156:: with SMTP id y83mr8727749wmg.89.1622131401913; Thu, 27 May 2021 09:03:21 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b81sm12080117wmd.18.2021.05.27.09.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 938221FF8C; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/6] meson.build: fix cosmetics of compiler display Date: Thu, 27 May 2021 17:03:15 +0100 Message-Id: <20210527160319.19834-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If you specify something like --cc="ccache gcc" on your configure line the summary output misses the rest of the cmd_array. Do some string joining to make it complete. Signed-off-by: Alex Bennée Tested-by: Thomas Huth --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé diff --git a/meson.build b/meson.build index 20d7035e44..3f065f53f2 100644 --- a/meson.build +++ b/meson.build @@ -2515,15 +2515,15 @@ summary(summary_info, bool_yn: true, section: 'Configurable features') summary_info = {} summary_info += {'host CPU': cpu} summary_info += {'host endianness': build_machine.endian()} -summary_info += {'C compiler': meson.get_compiler('c').cmd_array()[0]} -summary_info += {'Host C compiler': meson.get_compiler('c', native: true).cmd_array()[0]} +summary_info += {'C compiler': ' '.join(meson.get_compiler('c').cmd_array())} +summary_info += {'Host C compiler': ' '.join(meson.get_compiler('c', native: true).cmd_array())} if link_language == 'cpp' - summary_info += {'C++ compiler': meson.get_compiler('cpp').cmd_array()[0]} + summary_info += {'C++ compiler': ' '.join(meson.get_compiler('cpp').cmd_array())} else summary_info += {'C++ compiler': false} endif if targetos == 'darwin' - summary_info += {'Objective-C compiler': meson.get_compiler('objc').cmd_array()[0]} + summary_info += {'Objective-C compiler': ' '.join(meson.get_compiler('objc').cmd_array())} endif if targetos == 'windows' if 'WIN_SDK' in config_host From patchwork Thu May 27 16:03:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448861 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp643581jac; Thu, 27 May 2021 09:09:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz2rIGB7DPrdlla/O04NpMT67CcOOAgweN46yrhlkhlDFk0BqgChDGpKX6PqYtIg8ec4FjD X-Received: by 2002:a17:906:af05:: with SMTP id lx5mr2196386ejb.549.1622131744345; Thu, 27 May 2021 09:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131744; cv=none; d=google.com; s=arc-20160816; b=h5fm+JzYdDVOZEYHUtkE5RZk7BDLM0UxRmo4KaofvkxrBlldOt6TQLk/wNfY4bYOLM qoFReUnFDfPZpMXCvqFwUO0/AczyotXhs/4Ps+feddwFKlKKKY7Ze8Y+x59macuBJTZ1 h0ZJ1pPyGezkrwy59w2eDRWLdD9S3yOcxcqF2TzJkXaeokY4Ce4uE5mSPgFPyoRa+APG wGcCvIAGgvdEP5BLHwby8DHESpdsRW2fK0/S9QzkxHbaPjqdRm7gvtBUa/DeiSRRBdC+ NAGxhkTRh5q1GOJvLC0BcAqOQph770D88dyB/kluBfxRnVOgn4XX1X0neUEC+CmZsmdO niZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=//WP5NyEkM2KZxOSONWiz5eSL4w73b2EWWIfjaJEJ4I=; b=pmRfii/Djg9lGeP9hJ9UUb9BxEVnkN9cWNj660rByeODQNX6j6alWUuUh38JFKdVjV zwmeHEYMVNXQJhbBNwd/eLE54Cep8pI+S7R9ZhjA+TTv6KwLRBYHPbyxC2lwwrEHLRoS fTBQcFqCbAU30NRfu98KOGAtmjkTW1RlcWOMIfh2VNO09egOYjpq1mtY8wrEkZiJiOoq +Wmdoyi9SMslsJr7GWMI0ZWhDIdcQ091dkBIdrWYZ3SdGLoKtX2GnbBIXUG2kui7AqCC jLT38DRzOD9RYY346p7Hn8mV7d3+oZ9kLAcUgoqsSZAq5pVCAr/spxbNOzKBBGfwO1t0 Fw9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rHRZ6ets; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v9si2568028ejh.703.2021.05.27.09.09.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:09:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=rHRZ6ets; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIZD-0003By-AP for patch@linaro.org; Thu, 27 May 2021 12:09:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60098) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITq-0004tn-Mo for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:30 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:54004) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITl-0000L0-H5 for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:30 -0400 Received: by mail-wm1-x331.google.com with SMTP id h3so514674wmq.3 for ; Thu, 27 May 2021 09:03:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=//WP5NyEkM2KZxOSONWiz5eSL4w73b2EWWIfjaJEJ4I=; b=rHRZ6etsOQ+AvtW+bBjoS+rC8NH9LKcwBlL1noc1rDWd9+ak9L4XOzB5vB512aG88p sdQIfQ/XpyAZzQ2yvvRxq3B9QymVXeTKI5oziUF+K6bRQtWEr4yPyKsmZweNjyv6tQHZ gjKnKmniI0VI9Af8PEaYDX5i1QV7L2yCJx9fnO8oxZ2QtoK38HK0//DyvaBmiiLj74rL SNFs+GRagkahQX2xZwMYm/G0HxoXHzetvoYU/zidCZOJpyL6PTiY1LwC04Jkq4rPI0A4 Ym976A+E2G/Kw74B4F2r8Vm3aRUE5v53d/QM0F8i3Ac7h8YiEsYzWjZR6miiVm7Ud913 S0ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=//WP5NyEkM2KZxOSONWiz5eSL4w73b2EWWIfjaJEJ4I=; b=YSLU+l6gviLifpdedSNyH804sYxzd0H4k4P9upB23jZ5PHyIXHqoQwKWu+XAq+fTGI DWQPWrd02qJYmg9RwIrQaKGICbV2hK3m2cr0HPRwoC2y8jdBZBjGPSHpT4G1RUYHMpNd Eyj3OXztMQRe93/xpjXTCmWfyb0/hnzTgmawd4IgrSSfWzoJTTLNKJfLlvgpKWyx0raQ mpwhSR4EbXeSmgvSaOMf0TDuc3Pb6xb7+NHk+ANrWSpSezPZ+HIG06GhhKfduEt2d7Ac cMaNTs7oqECuuUFFwCSGeaYLN1UDyzYqHxRhZ3U5n0YbdUKLjdu1AGt7sQLGdVor1fs2 YYgQ== X-Gm-Message-State: AOAM530B5XUQOSTUS17BOrfQ9og5Y3+7o8yTZa/jcnqr7w6q1HSeHbnT /hq2QSqJqpPTXX3iFuEiE4N5rA== X-Received: by 2002:a1c:dc85:: with SMTP id t127mr2805019wmg.179.1622131403765; Thu, 27 May 2021 09:03:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q11sm4137559wrx.80.2021.05.27.09.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:20 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ABE351FF8F; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 3/6] tests/tcg/configure.sh: tweak quoting of target_compiler Date: Thu, 27 May 2021 17:03:16 +0100 Message-Id: <20210527160319.19834-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" If you configure the host compiler with a multi-command stanza like: --cc="ccache gcc" then the configure.sh machinery falls over with confusion. Work around this by ensuring we correctly quote so where we need a complete evaluation we get it. Of course the has() check needs single variable so we need to unquote that. This does mean it essentially checks that just the ccache command exits but if we got past that step we still check the compiler actually does something. Signed-off-by: Alex Bennée Cc: Thomas Huth --- tests/tcg/configure.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 Reviewed-by: Thomas Huth diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index ed6492ce59..aa7c24328a 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -222,10 +222,10 @@ for target in $target_list; do got_cross_cc=no - if eval test "x\${cross_cc_$arch}" != xyes; then - eval "target_compiler=\${cross_cc_$arch}" + if eval test "x\"\${cross_cc_$arch}\"" != xyes; then + eval "target_compiler=\"\${cross_cc_$arch}\"" - if has "$target_compiler"; then + if has $target_compiler; then if test "$supress_clang" = yes && $target_compiler --version | grep -qi "clang"; then got_cross_cc=no From patchwork Thu May 27 16:03:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448862 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp644711jac; Thu, 27 May 2021 09:10:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyOsQdeJFfrJQrIxg6qaUbXJ9ypmAQntFDyhOpMH+KOFK7jxpLxqt0RCo97U+ExvnT8Pvyb X-Received: by 2002:a17:906:110d:: with SMTP id h13mr4478447eja.45.1622131819571; Thu, 27 May 2021 09:10:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131819; cv=none; d=google.com; s=arc-20160816; b=hVefWkDNjDaEfZwBR52tb2YTSMync/1zlZx8tYNiY5PXKkpG2QeicIEa17lgmjFz3n XHZD2Kyao2Ia+505sc+hfdZa/0oVhKfCiqzXmSS1QgHKfF2vYrDam40lzVkn3q51PCCT BQHFsOm/FXZDuYKtgm1nOP+JCIqHOXbfWeWBRAB4g1Elm/YiGz40kk5x8KhZyahRA0Gp /hIduQB1RbjkZOi6+eLd2b0gjYD9WUTeaZzk3Via16bVWvlVO7HBRRKg+Ac5w+TewIYo ntImgf3TFLh2YHJb+65I/3WqXmio7mHCgEPohbugy6uNfpfB6JOhCFc9DDu35WRfPVs4 L43A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=ZvrR1j+fB5jV9IUc9AI57L8kElSuKg/8PdQt5sSpDRBiqBiCQOOaZ+Q3iyNmfk/2WI CbUDKDbscQt/jb0TKEPYDRAfunEbRnE5XT2Cc8ro6NjRetxd9bPPrH8XM/hdjDskjfBO fWnaMnN2przga43/66Yro23R+gZjuqXDyfM5iF9GYobdI/TUXsoBlPHYxs192DEvG2se pB16B2FHLfCqWSW+gSzWdJYz94DiTuIRne6jvypgUYBwQkEVBRqF6Y7N8Uy5b5u+XHNo f4Ba8X03ekRJ60X3cSbKgtv8yyo0evQHvEGFzeakSLbUnkhCyXaqmL00P3yLUBgpe1Md sTyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="NnEFB/X/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p18si629010ejz.187.2021.05.27.09.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:10:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="NnEFB/X/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41278 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIaQ-0006zh-Jg for patch@linaro.org; Thu, 27 May 2021 12:10:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITs-000506-BE for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:32 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:37543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITq-0000MT-8S for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id f20-20020a05600c4e94b0290181f6edda88so2933599wmq.2 for ; Thu, 27 May 2021 09:03:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=NnEFB/X/fcKTDhMHep2ELNzyR4x4ffY269gNCX9Zicaib5ZJ6JcZLTTXPSbFidhL1n dxXiU62dNaXlP0T/6fklz4mfC/jkaZw+38k20fSsxf/J6+T4ifMAkaoUtJK9ke9gbq6I dWkvzVE8cUpn8/RsvXmJ0kgfkJrsAio9YI1GDhFUuuCDGyBlVMErEGdUBTVU0ej9FG0O Rw2zkcNzqyOQKZ63QlU+VktR1gc6KypBCGAx482AXOa3GMByoalO6DiACvg0KiNqJKD5 Mke4ynTaR/98JFlp97VHELcITE17R0RzEzeHzdKr9cp1z/SP5O+rXG6IhiIGBnae7J8A p3dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xRPMPWB0aBHeL/5MePNBlEkOxaiPS0L4CeI6VALZd/s=; b=KehHX1OMOzl7pgaz+JYje2bzRFx57LEFLuGzGsOQc4tTkkT/VaHa5ppCGIofRD8auO gKPhq8+k7sTGOzRfo/QFjUooOgAo/51ozOm8tuBPzq/DTU9RPbwgNj6xF1RgkerB8YLi IZOuvWtDZ29lpNowjN2OIuE6aH2vPGolr9S3Xn+l5aVU8+KvEc7Gdn74bWOYeTSmSFRI MXajGPMmLXBbxiVdlzkIpia+mV60mVtLVbzK0JSyN6MrtNU8F8r8mFn5qQRGbCD+08yH elwk/Kls+0N3O4j4KptPKso4tTjGuO1tCZ1Qsl8qWrKSfxS4AF/zEVtic8yywXiffCZX zK8g== X-Gm-Message-State: AOAM5336zV6NXTpK1sZQBe1xcQbyBe0557PV/OCzVkYcpqK+AKIid7Ae OIJVn545+bC9ajzlCoRyS7m9lQ== X-Received: by 2002:a1c:2456:: with SMTP id k83mr4287216wmk.87.1622131405503; Thu, 27 May 2021 09:03:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m10sm3672480wrr.2.2021.05.27.09.03.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C63501FF90; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 4/6] gitlab-ci: Convert check-dco/check-patch jobs to the 'rules' syntax Date: Thu, 27 May 2021 17:03:17 +0100 Message-Id: <20210527160319.19834-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Thomas Huth , berrange@redhat.com, f4bug@amsat.org, Wainer dos Santos Moschetta , Willian Rampazzo , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Per GitLab documentation [*]: "rules replaces only/except and they can’t be used together in the same job." Since the 'rules' syntax is more powerful and we are already using it, convert the check-dco/check-patch jobs so no job use the 'only/ except' syntax. [*] https://docs.gitlab.com/ee/ci/yaml/#rules Inspired-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Willian Rampazzo Message-Id: <20210525132418.4133235-3-f4bug@amsat.org> --- .gitlab-ci.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) -- 2.20.1 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1c46392b2f..797403477f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -785,12 +785,13 @@ check-patch: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-patch.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 - allow_failure: true + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success + allow_failure: true check-dco: stage: build @@ -798,11 +799,12 @@ check-dco: needs: job: amd64-centos8-container script: .gitlab-ci.d/check-dco.py - except: - variables: - - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH == 'master' variables: GIT_DEPTH: 1000 + rules: + - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH == "master"' + when: never + - when: on_success build-libvhost-user: stage: build From patchwork Thu May 27 16:03:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448864 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp644972jac; Thu, 27 May 2021 09:10:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsWGF0QU0pKRO6qs+OA3FW6scCy0Gud9NtUCyuw14r3oX1pNoIxkh6YKKa0QC8n01Go8hd X-Received: by 2002:a17:906:eb48:: with SMTP id mc8mr3460330ejb.85.1622131834496; Thu, 27 May 2021 09:10:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131834; cv=none; d=google.com; s=arc-20160816; b=w7D6Sb3Q7vuw39IfpCl8Mo8TKmPYgK6S8wUYnxQHeTn6O5bWTmaJG7KnU7b8Idepdq dKX6pKrao0MF4Hmq6i+pW5XYlaJku2gf52uYZhsV83dva4Ay5OJHqAVltC8kOG73qtR/ /7B67xJeJ88q4vh2hGhT9R/i2JkL/c4IP5Mv7pF6ORn7SH3Mf7rBqVllrP5Wf91TdDfM gR8RdOwl5VZH9kJOyTT0bxaZfF6YeYUA5Q7vTk4PEFC9iumNfYWyyDKhNXMOpZGzvFN+ jOsitu70weAOT5DsD3TTCy5xPTwhDOIKW4MMpJJNgyEAEQ9QAOHbATPQTVmpCrrC1Ors 1u6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=twXj0d635Fiz5BppYsEZg7eYPQmJqaSgQryGFfAu3oBGmW1Las1/zBgimkS7SvNwo+ tDmsTsWAaMPhJET5PaSaE/5AutQEoxJODyw1zvVLiAr/HtGtUmnQFQH6IVQXwc5sqOX4 2tJwvf7DXdIT2KE0u+xlQ7yEkVUf7PZ5ORq6uyVdj50eemYc9Is/0kyAypJ0JssJ6Ql7 czrGou8SsPtxLZexZUjibFJL/HrxRDy2kg2xpmJWAmsve3GQrNyob4GZTarzbwfp15OI vkd3wCtWEAgy2c8kR24lKeHR5lP2qXNNqN6MXKPtUyS2xFcd8qxJDOmZsqjI92rgles7 iYdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NL5HmnMu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k25si2542496ejr.183.2021.05.27.09.10.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:10:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=NL5HmnMu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIaf-0007dt-HR for patch@linaro.org; Thu, 27 May 2021 12:10:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITt-00055i-Ms for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:33 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:54001) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITq-0000Mt-DA for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:33 -0400 Received: by mail-wm1-x32d.google.com with SMTP id h3so514836wmq.3 for ; Thu, 27 May 2021 09:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=NL5HmnMuQOgYlLu6urp7nrXIZ6d7d63AILxAmlsmA0m8aZHRbaw4ZJzEoPA5zfOCLz uWwZ6GG5+6Aan7LCXf/etC0greEHayOMkKgFIzcbqqstMpWuYF54jRbUYQmU5ECCsF2L DmtQ9bIQ1axgbyJuiXkS+nMrCjszVkgqlm+fe0Y/VMfDleTX+CPzHri1D21v2/OEPb9F GnpmBBQr+mB9w7G+j0ardx3eal8j6WOrlaTY1V3Dshg1/bNIIvrxQpYqJpJGPrP7Wc1f Gmv3pE2ms51qbUT75ZVDdCy3FX63JgFxQrPeQ+5lNaxbbJWrB9nEP2zrT+n+sWB+sCyQ beYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2tgNjmn++qDEbKJ67Irv9XGiW/c7HNn9pcJT1QLxGpE=; b=gUEMUsGnl9lXE/U0Qk+m8/euKbNQSOcwJ0G2H4jnlRBtQc3qaPUAv8jEpCkMW3LMpy TYg4EC4/nBEWUPKAnavdSk1aRSFJrtzsZCAXs5MA0PGzts5V3771Mu0J/2D2HJNlu+iq fLtzxtrtvM/iqjS7Zat/SQFYTFlquzHpt8ChKtwMW7GbEjYeF0P2qv7W06dmtm1BjzWg rkczXHSzlw4otqysZ4ekqNLiIBBI+tgnN+fc3bDC/EyBuTuMIGYTvOrptq1iP9rwpjdV ohdWaeYWYn0MKKP3mhH7iz7jcJqajvqK4gkG4QlDNQVnKYe0h6Z1+14FY6aAOTwkf4Md AY9A== X-Gm-Message-State: AOAM532tr28+7p6ODEo9nl9qGC0wXRUd8OFxj1ZH3Sa09uGfBFxU7LfZ 7jL4KUGGBHj/zuzsT6JhD1kdow== X-Received: by 2002:a1c:7f84:: with SMTP id a126mr9467093wmd.47.1622131407999; Thu, 27 May 2021 09:03:27 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z12sm4580722wmc.5.2021.05.27.09.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DD8201FF91; Thu, 27 May 2021 17:03:19 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 5/6] tests/acceptance: tweak the tcg/kvm tests for virt Date: Thu, 27 May 2021 17:03:18 +0100 Message-Id: <20210527160319.19834-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Really it's only TCG that can select which GIC model you want, KVM guests should always be using the "host" version of the GIC for which QEMU already provides a handy shortcut. Make the KVM test use this and split the TCG test into it's two versions. Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Tested-by: Willian Rampazzo Reviewed-by: Willian Rampazzo diff --git a/tests/acceptance/boot_linux.py b/tests/acceptance/boot_linux.py index 0d178038a0..7221452d4b 100644 --- a/tests/acceptance/boot_linux.py +++ b/tests/acceptance/boot_linux.py @@ -75,10 +75,11 @@ def add_common_args(self): self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0') self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom') - def test_virt_tcg(self): + def test_virt_tcg_gicv2(self): """ :avocado: tags=accel:tcg :avocado: tags=cpu:max + :avocado: tags=device:gicv2 """ self.require_accelerator("tcg") self.vm.add_args("-accel", "tcg") @@ -87,29 +88,28 @@ def test_virt_tcg(self): self.add_common_args() self.launch_and_wait() - def test_virt_kvm_gicv2(self): + def test_virt_tcg_gicv3(self): """ - :avocado: tags=accel:kvm - :avocado: tags=cpu:host - :avocado: tags=device:gicv2 + :avocado: tags=accel:tcg + :avocado: tags=cpu:max + :avocado: tags=device:gicv3 """ - self.require_accelerator("kvm") - self.vm.add_args("-accel", "kvm") - self.vm.add_args("-cpu", "host") - self.vm.add_args("-machine", "virt,gic-version=2") + self.require_accelerator("tcg") + self.vm.add_args("-accel", "tcg") + self.vm.add_args("-cpu", "max") + self.vm.add_args("-machine", "virt,gic-version=3") self.add_common_args() self.launch_and_wait() - def test_virt_kvm_gicv3(self): + def test_virt_kvm(self): """ :avocado: tags=accel:kvm :avocado: tags=cpu:host - :avocado: tags=device:gicv3 """ self.require_accelerator("kvm") self.vm.add_args("-accel", "kvm") self.vm.add_args("-cpu", "host") - self.vm.add_args("-machine", "virt,gic-version=3") + self.vm.add_args("-machine", "virt,gic-version=host") self.add_common_args() self.launch_and_wait() From patchwork Thu May 27 16:03:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 448863 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp644892jac; Thu, 27 May 2021 09:10:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJypFvk7JssIjIGbASLyYFREdfl4e1zgnzpEN62ArLho/6d+ano3tq0UfyD60WXhwZ1bmAxD X-Received: by 2002:a17:906:4704:: with SMTP id y4mr4650081ejq.68.1622131829620; Thu, 27 May 2021 09:10:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622131829; cv=none; d=google.com; s=arc-20160816; b=x7QTSF0264uqNsFRjEZl1dTBHq01q7e+nnkVgiBLvrN9ApfOnNrJ/k08bDKoC5j23J uNFQhd/V5rf2A8PrMLSyP+qvU2Dd37LdwTN23dJb8rECAEt7is8nzYTC8qZNBSK6KVzi 4uolgk65R2I4Jt78WwPQbyFyM8HBe96gQcXVtqIs2iKKdaRCFlQkEpeLzAP6j7MW1d6J AtUnJDpjikFpVgtojlVPVrrZG0izGle0bZCPMTsIDF1ICn5L3UxeVdeqzq0YU5QhWxBn mHtDVSN8mHaMTWx6garyFX8/1DFo3YkhloMS3lWAe5yn9vYY4RwRPgogmkhMykxLxG7x Vi5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=SCJwcBVAgyCms60jVhmkcV2f/TFnHD0gKghZiwudA4s=; b=WK2sg3wTWOX5e8oPNfRodeJfYZQXqtKppAI6ydRONTWrEkaATSXDk6FtzN/nqJSnAY xD/+O3dlts4sKo4mNL0GT7L3y+hL91VofFObLdpLY4fMv9wQnU62/P1jLowC8Xx6TGvD 2kdn/MlubbMtIhzDaByTrz2S2RQOxQtwtpVAUwAZu2hc0HAEOlA5i0Y9ZZn3suLH++JK +ugI3eNQm8ITXFzVvjQpBla33q6Vpt88SReB0OPo9WYjUH7JNEp3r4MvetVRxS7l969c nq1lA1NLpDhBhCeIYu1PSHdPSTsh+sA1vczZILK3sq0t4hVJQ62BDqUdDfHDXD0WBzy/ m03g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LQ53Qks6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x2si2769186ejs.442.2021.05.27.09.10.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 May 2021 09:10:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LQ53Qks6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmIaa-0000GS-GO for patch@linaro.org; Thu, 27 May 2021 12:10:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmITu-00057s-8L for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:34 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:34592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmITs-0000NH-0V for qemu-devel@nongnu.org; Thu, 27 May 2021 12:03:33 -0400 Received: by mail-wr1-x42d.google.com with SMTP id f11so448298wrq.1 for ; Thu, 27 May 2021 09:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SCJwcBVAgyCms60jVhmkcV2f/TFnHD0gKghZiwudA4s=; b=LQ53Qks6ia2EP2MB0FRx8BYaErQ4jxNvV8/8tN2CafEc+mmLgDijA6P38CAjCJRP/K AUUMLklGplq+bh4Vb7QwYs1uRB054B/1ILYvzIO8GqY5diSHavWgozXXTrhc31fkWV6t RIn1nhQdexzzRbUGiYgkYHkn8TMBfUBCegatTERLrypVch5I7SWHU66jo5vMmPqiws/B xgg0SXlezfdkf7cgzQ5gBd+UnJIwmuBgP/hk9Y9v+llsJKldug4p/VZZy+v/WTEyfQkD aTX2yLEbGbF8rxbW3qdv7qPg8BmmeM/isK4ix8NzU4sTyMdFgaA/qHGQIIf1SOIq9Qaj TuAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SCJwcBVAgyCms60jVhmkcV2f/TFnHD0gKghZiwudA4s=; b=EHe+BBoJZ2FOdW2T8fcpSWD65UjheBuuxz7NZOAX57nnDB1ilYjSV6QYMUnrk7LLVx 4xGOp3V8zxtuiV0UK9DallWDMNhLADL6MfAhsNoXLl4zy9erdI9GeoJdlFnAGn+/XiD8 ghGf7geiVQv9/6ZQmqSeJUgUJFdypfgsh35RS77enEWDzYKxNsWL3VGNGESJIZtTdOwn AB7rTpXw0JZRZ6m4KAhIItq90QfAP4afoUJJWYhbawssRIrgfybqfD6CytD5zcvkKx4I asRjB3l8vnwb/ox8JR9WAB0KzoDy3fWFrUXsGrzPAfFdtqS1aZwEzyN0H93MYf0nuDoc 90MA== X-Gm-Message-State: AOAM532NInymCk4ap7ttf5WH22AbjHXpN7hz5dt/YDHjgdZIdNP603Em js3vkXyp+ucoLgXAkckEqdGXSw== X-Received: by 2002:a5d:6da8:: with SMTP id u8mr4150267wrs.391.1622131410522; Thu, 27 May 2021 09:03:30 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id x11sm3656206wrl.13.2021.05.27.09.03.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 09:03:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 00D251FF92; Thu, 27 May 2021 17:03:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 6/6] tests/acceptance: tag various arm tests as TCG only Date: Thu, 27 May 2021 17:03:19 +0100 Message-Id: <20210527160319.19834-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527160319.19834-1-alex.bennee@linaro.org> References: <20210527160319.19834-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, berrange@redhat.com, =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , f4bug@amsat.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We should never be trying to run most of these models under a KVM environment. Signed-off-by: Alex Bennée --- tests/acceptance/boot_linux_console.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) -- 2.20.1 Tested-by: Willian Rampazzo diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py index 276a53f146..cded547d1d 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -333,6 +333,7 @@ def test_aarch64_virt(self): """ :avocado: tags=arch:aarch64 :avocado: tags=machine:virt + :avocado: tags=accel:tcg """ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' '/linux/releases/29/Everything/aarch64/os/images/pxeboot' @@ -343,7 +344,9 @@ def test_aarch64_virt(self): self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + 'console=ttyAMA0') + self.require_accelerator("tcg") self.vm.add_args('-cpu', 'cortex-a53', + '-accel', 'tcg', '-kernel', kernel_path, '-append', kernel_command_line) self.vm.launch() @@ -356,6 +359,7 @@ def test_aarch64_xlnx_versal_virt(self): :avocado: tags=machine:xlnx-versal-virt :avocado: tags=device:pl011 :avocado: tags=device:arm_gicv3 + :avocado: tags=accel:tcg """ images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' 'bionic-updates/main/installer-arm64/' @@ -370,6 +374,7 @@ def test_aarch64_xlnx_versal_virt(self): self.vm.set_console() self.vm.add_args('-m', '2G', + '-accel', 'tcg', '-kernel', kernel_path, '-initrd', initrd_path) self.vm.launch() @@ -379,6 +384,7 @@ def test_arm_virt(self): """ :avocado: tags=arch:arm :avocado: tags=machine:virt + :avocado: tags=accel:tcg """ kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' '/linux/releases/29/Everything/armhfp/os/images/pxeboot' @@ -401,6 +407,7 @@ def test_arm_emcraft_sf2(self): :avocado: tags=machine:emcraft-sf2 :avocado: tags=endian:little :avocado: tags=u-boot + :avocado: tags=accel:tcg """ uboot_url = ('https://raw.githubusercontent.com/' 'Subbaraya-Sundeep/qemu-test-binaries/' @@ -429,6 +436,8 @@ def test_arm_emcraft_sf2(self): def do_test_arm_raspi2(self, uart_id): """ + :avocado: tags=accel:tcg + The kernel can be rebuilt using the kernel source referenced and following the instructions on the on: https://www.raspberrypi.org/documentation/linux/kernel/building.md @@ -464,6 +473,7 @@ def test_arm_raspi2_uart0(self): :avocado: tags=arch:arm :avocado: tags=machine:raspi2 :avocado: tags=device:pl011 + :avocado: tags=accel:tcg """ self.do_test_arm_raspi2(0) @@ -471,6 +481,7 @@ def test_arm_exynos4210_initrd(self): """ :avocado: tags=arch:arm :avocado: tags=machine:smdkc210 + :avocado: tags=accel:tcg """ deb_url = ('https://snapshot.debian.org/archive/debian/' '20190928T224601Z/pool/main/l/linux/' @@ -511,6 +522,7 @@ def test_arm_cubieboard_initrd(self): """ :avocado: tags=arch:arm :avocado: tags=machine:cubieboard + :avocado: tags=accel:tcg """ deb_url = ('https://apt.armbian.com/pool/main/l/' 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') @@ -551,6 +563,7 @@ def test_arm_cubieboard_sata(self): """ :avocado: tags=arch:arm :avocado: tags=machine:cubieboard + :avocado: tags=accel:tcg """ deb_url = ('https://apt.armbian.com/pool/main/l/' 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') @@ -595,6 +608,7 @@ def test_arm_quanta_gsj(self): """ :avocado: tags=arch:arm :avocado: tags=machine:quanta-gsj + :avocado: tags=accel:tcg """ # 25 MiB compressed, 32 MiB uncompressed. image_url = ( @@ -642,6 +656,7 @@ def test_arm_quanta_gsj_initrd(self): """ :avocado: tags=arch:arm :avocado: tags=machine:quanta-gsj + :avocado: tags=accel:tcg """ initrd_url = ( 'https://github.com/hskinnemoen/openbmc/releases/download/' @@ -678,6 +693,7 @@ def test_arm_orangepi(self): """ :avocado: tags=arch:arm :avocado: tags=machine:orangepi-pc + :avocado: tags=accel:tcg """ deb_url = ('https://apt.armbian.com/pool/main/l/' 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_armhf.deb') @@ -702,6 +718,7 @@ def test_arm_orangepi(self): def test_arm_orangepi_initrd(self): """ :avocado: tags=arch:arm + :avocado: tags=accel:tcg :avocado: tags=machine:orangepi-pc """ deb_url = ('https://apt.armbian.com/pool/main/l/' @@ -744,6 +761,7 @@ def test_arm_orangepi_initrd(self): def test_arm_orangepi_sd(self): """ :avocado: tags=arch:arm + :avocado: tags=accel:tcg :avocado: tags=machine:orangepi-pc :avocado: tags=device:sd """