From patchwork Mon Jun 7 14:32:56 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: 12303651 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDF97C47082 for ; Mon, 7 Jun 2021 14:34:40 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2B7606109F for ; Mon, 7 Jun 2021 14:34:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B7606109F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:39992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGKt-0005aM-57 for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:34:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJV-0002yi-7I for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:13 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:53778) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJP-0000KO-Gv for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:13 -0400 Received: by mail-wm1-x334.google.com with SMTP id h3so10204115wmq.3 for ; Mon, 07 Jun 2021 07:33:06 -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=CD8MK1dqrE7V3HgQu/qknHgJp7sj9gokbgu7xhjg20o=; b=GvMMRDOB0P9flWO2FRxGB40qiMl050eDXyDgNfQkIOfZrvLgCDshzrT1kaJRUoDGew sn3NR5kGmXR8hOzg4UOBTKHTmYxelKFxfA1NnLwPb4P0IzzU/9/WV5qd2bir5ElZOnPi qR2ze1OGWFcs8p6eLdD1me07J6XntRZQRBYBBzm2SF5DQ1tK3b13cCp0UiLBp13+eAn/ kGxTPq/X3AMraP7syRFYG7BYeVWsaibn12wTZj6JTo9vO7+BvgzSI2ad9evWoIvsYvQA u5qvLPfeOZi0r327ePVQgcUKfGn4Hqqz/zirF6QRSRG3JCbiuvuCuWfbVuuMXeTozREA niYQ== 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=CD8MK1dqrE7V3HgQu/qknHgJp7sj9gokbgu7xhjg20o=; b=nOXIJ87nfQQ8cceWw2/60dKsnX7PHh6MwpxjXAMjgl0rmwnQWRs7mQyK0DTBGwMP3y 8+2EmFR9zJY5zBboV+9qF+dmPzIxPvJeqZqJqvlNke6W6wi495X1I8X3ur1Y6l4tjvfE QxgL2e5pUV+fib/RyEBU/l593PLj0V3Vpqr5ptQFXzAtk6YJ5naEskwPBFilS7eutGZZ DQqfPQs2nGzgStsNNZmSxwV9LTPYx6Lpp8KXX00UZWFc250hzpFzyP5JiitFYWDU0Csx bOiRME3XO0mUWJVMWso5qzucOdTYpWud7vbUA/IGpYmm49W1IiKlEM3AMw7SgmaSoVsM N4Wg== X-Gm-Message-State: AOAM5338JT0nVKPtFfvvCe2YdUU4s8aixE5ooNTOWY0OgIVVNno05A/N LBK8rBR1KCzrijNgbnnKInEbjA== X-Google-Smtp-Source: ABdhPJxc4z6wTT7zoc2lCj97PVr/xmgGTIFOsSabKkAp6h+xE6VMYEeFxTPEQSTZA2+znAUae5sQOg== X-Received: by 2002:a05:600c:47c4:: with SMTP id l4mr16962146wmo.145.1623076385743; Mon, 07 Jun 2021 07:33:05 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u7sm12440623wrt.18.2021.06.07.07.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A75101FF87; Mon, 7 Jun 2021 15:33:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 1/8] tests/tcg: add a multiarch signals test to stress test signal delivery Date: Mon, 7 Jun 2021 15:32:56 +0100 Message-Id: <20210607143303.28572-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-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=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: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20210527160319.19834-2-alex.bennee@linaro.org> 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 Mon Jun 7 14:32:57 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: 12303653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B1E1EC47095 for ; Mon, 7 Jun 2021 14:34:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 644276109F for ; Mon, 7 Jun 2021 14:34:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 644276109F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGKu-0005iU-HR for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:34:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJV-0002yq-Pp for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:13 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:38662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJT-0000Ld-SB for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:13 -0400 Received: by mail-wr1-x436.google.com with SMTP id c9so9201982wrt.5 for ; Mon, 07 Jun 2021 07:33:09 -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=PP68Do5QSeD/5zyGX2xofOgTOB6AlQQTS51+z1GqTzg=; b=qEiaTXyMydU441xSzvH5B6hY6Dr7ykb1MPWcA27AMV/PJzGMHwuwxkP5HvdDh/e06z UVg4FI6b45t3p6128T71iQWMC1hPr8Jzdf6DMRaSC2T/Sw9CbgJNpwPWKHu2Wq32Z0lf ImraOL1K4cCHmbI6gjPFR0NDpdvr/qacTTmO0Yfn5Qhw8r9VyCKsNXUlEXcrlsf7Ihv0 zOnEu7HxZRGrmVVxwsCx8ABrW8yZGyYZEhA6ZW21mEkjz3ix9MPy7o0O6KygTW3B2zk0 6GbuNIwv0hYLTJNNYnA5dpyxOQS+yP4gI9JlL+hJFVmrfXpkdl1QIXmbF43uIeCOliWJ ytFA== 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=PP68Do5QSeD/5zyGX2xofOgTOB6AlQQTS51+z1GqTzg=; b=glHNzToZcP6RdWvfsZ8SCqAZJPP6gxg6+dDhn+T1sKFf8WYIYkkB0nLdBhQsCJp9wU jq8XQgidXTiYFaCp4K26V6xAkLwMiwh9qHhFh5wMc4dwMzWFYVzRGb4VPyKv68N/Tz2B cPbmsVW0QS6oWP/8FWKEMkGQC08uBz1mYoO26Mk9jLzM3tiACJ0nmGhgVebtsY4FiHnH 6Z2XBqlk2SeCBa5UzPn6/Q+uyF/Ht7Ih9+66p5ZV0E/7/n4+011CWoMNoN+mks2a/Hls dULLT+C1sV4ST7eBCmakP6ocxc+r0WlFm3HV0krcdc5qgTDL34pJlrWInbk4e/Ax0Po6 iVoA== X-Gm-Message-State: AOAM532cAfWVp8q5qEHi8F2uuLAz8Xmc1WpNNcNXr1qm5NPWEZ1i9yJV WLzjxhTUadNwr/Mk8i2rSrMVvQ== X-Google-Smtp-Source: ABdhPJy+1HqydR/jH407JnNG/ygnS7Y/ccb0tcCW9UUmCKT3vWTXJ8wb7SXOEcFBZMRAEXzsIz6RVw== X-Received: by 2002:adf:d1c3:: with SMTP id b3mr9220981wrd.110.1623076388877; Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id o20sm6724108wms.3.2021.06.07.07.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BDB1F1FF8C; Mon, 7 Jun 2021 15:33:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/8] meson.build: fix cosmetics of compiler display Date: Mon, 7 Jun 2021 15:32:57 +0100 Message-Id: <20210607143303.28572-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Thomas Huth , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20210527160319.19834-3-alex.bennee@linaro.org> diff --git a/meson.build b/meson.build index 626cf932c1..d2a9ce91f5 100644 --- a/meson.build +++ b/meson.build @@ -2537,15 +2537,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 Mon Jun 7 14:32:58 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: 12303659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0EE7BC47094 for ; Mon, 7 Jun 2021 14:36:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C64C96105A for ; Mon, 7 Jun 2021 14:36:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C64C96105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGMu-0002sd-Sn for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:36:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58790) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJW-00030R-PN for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:14 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:45813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJT-0000Lj-SO for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:14 -0400 Received: by mail-wr1-x42b.google.com with SMTP id z8so17847506wrp.12 for ; Mon, 07 Jun 2021 07:33:10 -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=j3NTNXz+uS7lfDmWPW0+9MGKzWKidvbpOVLTCYmft64=; b=meYNdQKI4kHqMN1YRia38Ifzbwju9rJXJqhQMlZf/LQgT8UQCe+tUE5Cz5WUutT7Uu Erf9w0siD/dOr2kI3EimEw7pydxMY4iSRkhA9ZphsRQ5acQ/jxzYcQXa+53uPREcg9EC I7XJ1nbGADLHENP5uUMQU0tdOs4J1TLrQkQmhR/jzkg43pijs4jul2gioulUExsQwV/1 YCz1gQHTYozdgN0zSwPv4Z8FS8EfJckU9MIm+jyuk4udLExR4tmdInCoKbkuOGl4mi5u rAfJptLertJJnIoepPhweAn6RWh5usnuJg3TeJT8ujH9Q7AYqNQe8SluSVXap6bw/MVF iS3A== 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=j3NTNXz+uS7lfDmWPW0+9MGKzWKidvbpOVLTCYmft64=; b=jje1e9R+ZuOVU5gVskavdm2d40q2Hl9JU7tJIhZwfY5fa7sYMVXvrmSbjz3LkSqbwI jzWZ6Uz9JqCaDDoGL2mj+4UrvsvUWgnxpriZfbjqJhRrLs/cUbeWDq7rsUUqZdp1gkqr KGIG8GXx7cD+PceY/7gHULwSna0Sf/NBpb4tn+Ue6i9AZHb4ewmE287GWjmWk5QMs4K6 Rbtnyhgcbp0Ix15pmCh9kzF1w0BRdcgq+OpXVssIGlmwHWd8U3RCSSrPuoy6BAzA4TqC lsmKGKWtUq8t4YvG/neLEiggUJfXBX08NPFDzFD0GBiNknQ8R879kLdRPKuLVErG+sP5 Cc/A== X-Gm-Message-State: AOAM532ZaXoj4GJ1pPo91BO+iCsUuG1itc0qgcgJXXlmLUCz4r3yONk/ XTl/fMej0ahzFbisuJ5ROIfB+Q== X-Google-Smtp-Source: ABdhPJxFVQeB8J4aBh3nF4qXBUvaD4iDLiD9itOJnlQQvBH/hpu1NYns/ShOEJi4MpOE1D8tPVMr1A== X-Received: by 2002:a5d:4351:: with SMTP id u17mr17296640wrr.47.1623076389566; Mon, 07 Jun 2021 07:33:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id p6sm16635878wrf.51.2021.06.07.07.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D3C881FF8F; Mon, 7 Jun 2021 15:33:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/8] tests/tcg/configure.sh: tweak quoting of target_compiler Date: Mon, 7 Jun 2021 15:32:58 +0100 Message-Id: <20210607143303.28572-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Reviewed-by: Thomas Huth Cc: Thomas Huth Message-Id: <20210527160319.19834-4-alex.bennee@linaro.org> 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 Mon Jun 7 14:32:59 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: 12303655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-21.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4927EC47094 for ; Mon, 7 Jun 2021 14:34:44 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B96DA6109F for ; Mon, 7 Jun 2021 14:34:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B96DA6109F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGKw-0005rv-Rq for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJY-000348-5L for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:16 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:37475) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJU-0000Lw-Q0 for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:15 -0400 Received: by mail-wm1-x332.google.com with SMTP id f16-20020a05600c1550b02901b00c1be4abso2505039wmg.2 for ; Mon, 07 Jun 2021 07:33:12 -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=rI0R4bYUescEvm/efc4mHQ4PtU1tZsq80hE1w0dikSA=; b=jTj+49CmrF0Bpd7w92PvAGhREAFj3MCbj/cR0PpArEt2SkHIU/henAbpaSU92gKU8v RT9RfFdIEsK86N4O9dGj2+lRvzS4wkvMaHDCfi5jNa8aoqtRmDxnOK75hvb/2VGTFlKj xcu21ey30Iv+NauqbAOeYO2HaSArEwcr6P6PK43KRDJWwZIeZMQAzghEZZoHvsaYNQ+a gxW5BopsvOuEQ0DrW5nPQ2kcAkXXeieT0kAKnQFXg5o9NGFPwdA8e2zXXZYE2I3FI9Xa j6looGx0BLwKKnaqnGGx6dpxiVCR5Ew4gEvVqLgqC226i0gVYpnUC7sHiO0eF00v5ihn 87lA== 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=rI0R4bYUescEvm/efc4mHQ4PtU1tZsq80hE1w0dikSA=; b=OuZiv4Ewi9K3n8zvCgBGZTtasNSb0Sb+QtXjFN2DQfa72ne/2vseqy0KdkGZCmmyrs UpM2Ozmg/LHWNRQ3JDFVIJl0j15qvLV14O6isAmYrTiuCM5P1UwjqmxEoMCid4/v3zy2 9i24UIKtoTdb26tSc6QN+TwBwmK4Qdi48ACL3ykoTpFLXLXTS5Nxc6Kyb2R/hgk9eJEN n2EsoiUdqxVEXBDglOZArza8pzXMG33WxH5EW5OAPaiku8zZUNWGzOMK7keIQyY8bUDq fTk27wQhvGLWo9LawL7gS8qLzGkzhXSV/DP4Qnxiz/FyG1ue2Oi8A0YHKHvrTgvWQwQA XA3A== X-Gm-Message-State: AOAM532Kb1tu94crjBhg0SC2+jCfSrEi3+lYADeLyMIwWM01EDPe03s6 bu23NuBgSuyYVMJwtlMF2BvxaA== X-Google-Smtp-Source: ABdhPJyM8QWu7QUovWbTh06yA9Opi7mnHOkh6TPdp1ZJPpyPZxbkYRILa6CqpcxqJqM6koHDp3FIWg== X-Received: by 2002:a05:600c:4e8e:: with SMTP id f14mr891502wmq.172.1623076391501; Mon, 07 Jun 2021 07:33:11 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l16sm18144201wmj.47.2021.06.07.07.33.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E98B01FF90; Mon, 7 Jun 2021 15:33:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 4/8] tests/acceptance: tag various arm tests as TCG only Date: Mon, 7 Jun 2021 15:32:59 +0100 Message-Id: <20210607143303.28572-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , Willian Rampazzo , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.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 Tested-by: Willian Rampazzo Message-Id: <20210527160319.19834-7-alex.bennee@linaro.org> 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 """ From patchwork Mon Jun 7 14:33:00 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: 12303657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 822E6C47082 for ; Mon, 7 Jun 2021 14:36:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4BE706105A for ; Mon, 7 Jun 2021 14:36:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4BE706105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGMs-0002kM-DZ for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:36:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJY-00034n-Ar for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:16 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51760) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJV-0000MV-Po for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:16 -0400 Received: by mail-wm1-x331.google.com with SMTP id l9so1195320wms.1 for ; Mon, 07 Jun 2021 07:33:13 -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=GJX41Cyp71VELU0zs8YHXUqZWa3i/WmdvaiSBLJrNCQ=; b=lsCQqQCwYTJxhMMG8WZOdCLRUQJDfmB349azkSXqqbYLwz9o+pO9gn6pENWNS/864r T20G6XiTRUqLJlMt6Qt3Lf8PYY3GoiUYVZ1Rpgt0eEfJVJgpDwPXKR0sclrXNEVwd8mA 7aD59+JFvpwpV1KV7rspnWL39dwR3sx7mdMyrBe0V58ny2wcG7PNiTHoHgOp51kMuvoF jyz8xtA5Q0XGNLHonx65c2HInA9zGRXTAZsFWiwUnpae8EqmVwHYiVLAPECZOFBo6aLg nfP7RKUnTk2t86Fa4y+6FefxcwuyJiaRweJlD9BS3DL+Lou08yBsfP1FLwKPsH8uOyu/ 15kQ== 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=GJX41Cyp71VELU0zs8YHXUqZWa3i/WmdvaiSBLJrNCQ=; b=CW2pKR2E+tNEZtqvbn9tCFzf2fY/Rxb/vVci283atz1oXVjv6gx9ferEmUASMRCJPR zCqj/qPGCTICgtIlCXTVTjfFD+loDTFQ0lIF8MQl9NEFJCF77opyCd1DCanLCHYv0D+G qXjybuVqXRS6qN1CcRa/Uu2nspiCqikDoN9umtlq+r5IBkLwjNTHDxAZdon7/Iwfn5O5 fbdXSzO0hvHmSRyz8jYCdzf0pIEfDrmwD3wNh8fVBk64V+4/lI15wRckVh+zuKM8T2/a cyD+ND0VQaVvu14BqzA28QvuYAZ/wNneZAFMP+11mfp2Bt/UoEbK/ss2aH8q+vDFilok v1lw== X-Gm-Message-State: AOAM532HPyeCtvb+3UGcdPKr58S4jxaDUfCep9XxAL/w+TqfCujQjUHY 5O32i69xC6F5bRKWSIqIq3Lqlg== X-Google-Smtp-Source: ABdhPJyvfh4wC8CNVHCZAevOF+FjE8iJ6mPmMUd5x1NzZ21rEkOesKLTfnBe0bYfVdQ5o37A6Nlxtw== X-Received: by 2002:a05:600c:4ba1:: with SMTP id e33mr11571343wmp.39.1623076392428; Mon, 07 Jun 2021 07:33:12 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m23sm20745072wml.27.2021.06.07.07.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A5731FF91; Mon, 7 Jun 2021 15:33:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 5/8] gitlab: work harder to avoid false positives in checkpatch Date: Mon, 7 Jun 2021 15:33:00 +0100 Message-Id: <20210607143303.28572-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-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: Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" This copies the behaviour of patchew's configuration to make the diff algorithm generate a minimal diff. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wainer dos Santos Moschetta Message-Id: <20210602153247.27651-1-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index 8e30872164..7e685c6a65 100644 --- a/.gitlab-ci.d/static_checks.yml +++ b/.gitlab-ci.d/static_checks.yml @@ -3,7 +3,11 @@ check-patch: image: $CI_REGISTRY_IMAGE/qemu/centos8:latest needs: job: amd64-centos8-container - script: .gitlab-ci.d/check-patch.py + script: + - git config --local diff.renamelimit 0 + - git config --local diff.renames True + - git config --local diff.algorithm histogram + - .gitlab-ci.d/check-patch.py variables: GIT_DEPTH: 1000 rules: From patchwork Mon Jun 7 14:33:01 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: 12303661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48FE3C47095 for ; Mon, 7 Jun 2021 14:36:47 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1441560FEF for ; Mon, 7 Jun 2021 14:36:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1441560FEF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGMw-0002wb-8m for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:36:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJa-0003CX-HT for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:18 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:39533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJX-0000OM-RW for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:18 -0400 Received: by mail-wr1-x436.google.com with SMTP id l2so17917694wrw.6 for ; Mon, 07 Jun 2021 07:33:15 -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=En+VgcZCJTCFePloXJZOXFco80DAUV/fbZwnSy9v9hM=; b=d3DTT4JYzRL1LbjsEkjmAUldPJ2cuguWDymm26TGSUMKb/AOsd6hIomGGpbyFoJT61 kP3Ko7IeeRWtOscXQSl1eBAfmRfSq21vPbX0dxJlZt/UBrCLuZFJzvOeGcys7EyQGjH3 aKpnLPHd5ejVks7+KuXR1Lo+uD9I+vAF4xGU6LKYGWKZByI4M5/+nWpyzuuZ4iNLcGkm H1ziuRpw/G1ztom4DpnsGUXqwruL+FtR9pswmppZsO9kqQlFfLlbbesxVh7KOKcaLbpU 9XWo5zuGXDBF6D/6ijtJaL+m1zk21tzYEtWKnBtqvHkjDyGyj5zsDydA4TkrMEiVKrL4 MWDQ== 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=En+VgcZCJTCFePloXJZOXFco80DAUV/fbZwnSy9v9hM=; b=iAlXg5fZD7BiS+aQD2Vd7lf5JPQSpJGYYRmcjx/EnQhok3AOLC0XvOLFU6dqJ2Z2uI 0dJk0d+P9EIwojPpopzI7r+tFtvhDGJPxtBAupFHgQ3djqdtF1cJBlW+zwYpoPnDIfmb 9ukazkrLqE6EFvM28T/uGOGikwbmFBNDavlLzVhqwI4nL5wD3Jct4CPzRbUDIKtO9cc9 YV8yEWkDIi7CTQiBYDcmn4lALJ8rAHaHlhD4FQ2M4ny5+zI5Nyjlbb4vxWWL98IuZbyk UvAuWApiHy99TASsyaDNR0up7TUPA8pE5131lJw7lwKvie9x/X+mL2pYvclIRZxSa0C2 YLMg== X-Gm-Message-State: AOAM532f6TVqIvvJs8f1oUIZIFT8UNJG6KFiixqWvbR3gVp6D0CcYsgC VFdvsoi1MzA8KtUJ7RecdI3Hxw== X-Google-Smtp-Source: ABdhPJxb5R+ZVdOx9puak7CKo7Vil8eA1DZe8vtMhZ+rR2Sdv0x/HDH3qpy8QKpbkB1vprCy+RDSXA== X-Received: by 2002:adf:f5c9:: with SMTP id k9mr16793010wrp.180.1623076394487; Mon, 07 Jun 2021 07:33:14 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a4sm14917064wme.45.2021.06.07.07.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 21F871FF92; Mon, 7 Jun 2021 15:33:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 6/8] gitlab-ci: Split gprof-gcov job Date: Mon, 7 Jun 2021 15:33:01 +0100 Message-Id: <20210607143303.28572-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé This job is hitting the 70min limit, so split it in 2 tasks. Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Willian Rampazzo Message-Id: <20210525082556.4011380-7-f4bug@amsat.org> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index b72c57e4df..d9b834c848 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -558,16 +558,27 @@ check-deprecated: allow_failure: true # gprof/gcov are GCC features -gprof-gcov: +build-gprof-gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container variables: IMAGE: ubuntu2004 CONFIGURE_ARGS: --enable-gprof --enable-gcov - MAKE_CHECK_ARGS: check TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - timeout: 70m + artifacts: + expire_in: 1 days + paths: + - build + +check-gprof-gcov: + extends: .native_test_job_template + needs: + - job: build-gprof-gcov + artifacts: true + variables: + IMAGE: ubuntu2004 + MAKE_CHECK_ARGS: check after_script: - ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh From patchwork Mon Jun 7 14:33:02 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: 12303669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60EA2C47094 for ; Mon, 7 Jun 2021 14:38:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 23AB66105A for ; Mon, 7 Jun 2021 14:38:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 23AB66105A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGOA-0006b7-CO for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJc-0003Il-35 for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:20 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:46696) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJa-0000Q0-7N for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:19 -0400 Received: by mail-wr1-x42a.google.com with SMTP id a11so16015171wrt.13 for ; Mon, 07 Jun 2021 07:33:17 -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=DI4OcJA29QFIm91G7GUTHfaKFnWUsXmcsMW7JjhiiL0=; b=XZaQ9JITFfEeH2sW9kODOEAjm6BeVcmWgNvH1CMlcGimSsPcyvJ7YNn5+9fTVyhyk6 c5tMBlcDtmnGTA6CdvQoJGAHY+fK2/+kR+pbB12C1SRrLUxHZR/hbRDYwVFDB30ItQ0q EE8GtQErBLN5kKe8cGjkDRON/u4xnNMh/diwlslyisEOIZJJERHZqMNRw7jIR/qDbFVU 4WXLRAmDmHgsommvjqeDqhbgZ+SZ0UevlBzexKcpo0+JE0mjWSKr08iETll1h0QptOrB YFjyfFK9co2vs50Pmup/A7dHJgxqVa62MVJ6H4iKPqh5SLw3GjK47YXf/nvyW8zRyzjL XeqQ== 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=DI4OcJA29QFIm91G7GUTHfaKFnWUsXmcsMW7JjhiiL0=; b=a5Rti5O39IryB/zLyr0PDawVWBjpxwHoX1cl3uE62ScRbNAZuA+0DhqtzmL7qimYIU k7FxGdIUeRrsRsgGGVvbFjE3rtNX5KFuto0PpJCt4rW8rt4EY3Vgr2xaJPTUUvnKWVcA HMCaThfEW36v0CgHlyNeHYCdvfxoXT1/Ocd7CnPq45uYn34zsaM8uyFa1V33cEUDn8rB TNjx7Jf5XeacZEzQiEZJ7L29F4QpZeKWdepT05SaWg3JiLy0KqKvTO28SSJQzjjsqHVy OClovd1zFsdIzeQpnOg3J34IAYip/v+dRbgykm/aPsi5EFHJAoENgKtBcxb9t04ShKhV BnRw== X-Gm-Message-State: AOAM533MgDn9/SGeVqgBII7AomscdFTc6uJmI90S/4WfeuyOmNoIFWFw n99ZV8DwbUIYUvsSkohy+qEFGA== X-Google-Smtp-Source: ABdhPJxgLpuq6/Dzzq2gFKiErJ3mqBAlRwI4BBBW4WND5gNvuPwRqINq6B/zh4koH2Dr+VVi+MjiIQ== X-Received: by 2002:a5d:4903:: with SMTP id x3mr16588057wrq.376.1623076396909; Mon, 07 Jun 2021 07:33:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h6sm7760970wrt.20.2021.06.07.07.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3AB241FF93; Mon, 7 Jun 2021 15:33:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/8] tests/vm: expose --source-path to scripts to find extra files Date: Mon, 7 Jun 2021 15:33:02 +0100 Message-Id: <20210607143303.28572-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-devel@nongnu.org, Wainer dos Santos Moschetta , =?utf-8?q?Philippe_Mathi?= =?utf-8?q?eu-Daud=C3=A9?= , Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Currently the centos8 image expects to run an in-src build to find the kick starter file. Fix this. Signed-off-by: Alex Bennée Message-Id: <20210602103527.32021-1-alex.bennee@linaro.org> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index e94d95ec54..f3a3a1c751 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -84,6 +84,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \ $(if $(QEMU_LOCAL),--build-path $(BUILD_DIR)) \ $(if $(EFI_AARCH64),--efi-aarch64 $(EFI_AARCH64)) \ $(if $(LOG_CONSOLE),--log-console) \ + --source-path $(SRC_PATH) \ --image "$@" \ --force \ --build-image $@, \ diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0f2e436ed3..254e11c932 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -96,6 +96,7 @@ def __init__(self, args, config=None): self._genisoimage = args.genisoimage self._build_path = args.build_path self._efi_aarch64 = args.efi_aarch64 + self._source_path = args.source_path # Allow input config to override defaults. self._config = DEFAULT_CONFIG.copy() if config != None: @@ -591,6 +592,9 @@ def get_default_jobs(): parser.add_argument("--build-path", default=None, help="Path of build directory, "\ "for using build tree QEMU binary. ") + parser.add_argument("--source-path", default=None, + help="Path of source directory, "\ + "for finding additional files. ") parser.add_argument("--interactive", "-I", action="store_true", help="Interactively run command") parser.add_argument("--snapshot", "-s", action="store_true", diff --git a/tests/vm/centos.aarch64 b/tests/vm/centos.aarch64 index e687b93e52..81c3004c3c 100755 --- a/tests/vm/centos.aarch64 +++ b/tests/vm/centos.aarch64 @@ -64,7 +64,7 @@ class CentosAarch64VM(basevm.BaseVM): def create_kickstart(self): """Generate the kickstart file used to generate the centos image.""" # Start with the template for the kickstart. - ks_file = "../tests/vm/centos-8-aarch64.ks" + ks_file = self._source_path + "/tests/vm/centos-8-aarch64.ks" subprocess.check_call("cp {} ./ks.cfg".format(ks_file), shell=True) # Append the ssh keys to the kickstart file # as the post processing phase of installation. From patchwork Mon Jun 7 14:33:03 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: 12303663 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99112C47082 for ; Mon, 7 Jun 2021 14:36:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 627D460FEF for ; Mon, 7 Jun 2021 14:36:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 627D460FEF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lqGMz-0003B0-Fu for qemu-devel@archiver.kernel.org; Mon, 07 Jun 2021 10:36:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lqGJb-0003Ew-3m for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:19 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:53775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lqGJZ-0000Op-BS for qemu-devel@nongnu.org; Mon, 07 Jun 2021 10:33:18 -0400 Received: by mail-wm1-x32f.google.com with SMTP id h3so10204544wmq.3 for ; Mon, 07 Jun 2021 07:33:16 -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=8wY8xOMGbmc+p/CncxVaITnpCcAwvAmU9tqM+XkzmY4=; b=DT6dBAgIhTvn1hveizIcCFuYbTmkxhTFkGQUx6arfLM9tfEh4V6UPzNOp2zbnZCPT3 3GiI5uri/xL3YZkJlnApRSk3DYFAk600MylwBm7DSqufIsSGdfZFSfpZXaoJsUdH6/PN UyiKKZLgduaGvXleRp49gwyuQz+6Ey6dK1Wn35pBJxcQ99J1DInm5Ij7q6ICPBLzMUpc FddxhDNOqW16wBO6gOyPiFFOHYDR4XtIxpfugxbt42Hlz/B4Dxv4Lkcz/mG3735m/K01 +nETRaiBYpiG3KS5CkgrpNVewBj9IANC60se8NphEKHrt3G2k9FrXfu54FCdFeclKh/N bN/g== 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=8wY8xOMGbmc+p/CncxVaITnpCcAwvAmU9tqM+XkzmY4=; b=M9w8pYuUjSHowA/P12BoqDaCJ7WNHjdiVd76+pq5ycQ4DQK2Ur7WUmH9DcehoZcvJc a7CFEJhLm1BuOkL8gi2yEObudaUxoUS84fv1537/3GpuUAffVdzyCov95DgOi1q1eQNY Qbqv5OjF28/jGP9d31dbE5pCZBwLASvpBwwswZfUOjzZKeLK1aODsrjrmmwhPvtXNHRD D8oEVCH0IBfoc1fzZtptKfHB18XW/W1vyuk6SsgSDj23t/pUxX3+pahdGINwwJ8eTWOA Aof63Hy3B+K7AIUOdsWMH0vtS15NFwxvNxOCOCWEKT8FPkIGYHugFzTk/xlByrjkFWJe FS6g== X-Gm-Message-State: AOAM530gPlMffVY+QE6QhvvC9p8lUmjCL6bIsQnHQ05iU7fLa60ZmV84 EaiDoznOipMDU25MZBcvURb77w== X-Google-Smtp-Source: ABdhPJxzVZe6LsqfUF8v2sX3WMrzv1ltXVDnw/AEX/6oISRqIZiK6XS1h/IYOogPpTkjnpZ/kyVrhw== X-Received: by 2002:a1c:c256:: with SMTP id s83mr16893496wmf.86.1623076396043; Mon, 07 Jun 2021 07:33:16 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id h9sm14280306wmb.35.2021.06.07.07.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 07:33:08 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4EBB91FF96; Mon, 7 Jun 2021 15:33:04 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 8/8] scripts/checkpatch.pl: process .c.inc and .h.inc files as C source Date: Mon, 7 Jun 2021 15:33:03 +0100 Message-Id: <20210607143303.28572-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210607143303.28572-1-alex.bennee@linaro.org> References: <20210607143303.28572-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: =?utf-8?q?Alex_Benn=C3=A9e?= , Luis Pires , Matheus Ferst , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Matheus Ferst Change the regex used to determine whether a file should be processed as C source to include .c.inc and .h.inc extensions. Signed-off-by: Matheus Ferst Reviewed-by: Luis Pires Message-Id: <20210520195142.941261-1-matheus.ferst@eldorado.org.br> Signed-off-by: Alex Bennée diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3d185cceac..bbcd25ae05 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -12,7 +12,7 @@ use Term::ANSIColor qw(:constants); my $P = $0; $P =~ s@.*/@@g; -our $SrcFile = qr{\.(?:h|c|cpp|s|S|pl|py|sh)$}; +our $SrcFile = qr{\.(?:(h|c)(\.inc)?|cpp|s|S|pl|py|sh)$}; my $V = '0.31'; @@ -1671,7 +1671,7 @@ sub process { } # check we are in a valid C source file if not then ignore this hunk - next if ($realfile !~ /\.(h|c|cpp)$/); + next if ($realfile !~ /\.((h|c)(\.inc)?|cpp)$/); # Block comment styles