From patchwork Mon Apr 24 09:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 676558 Delivered-To: patch@linaro.org Received: by 2002:a5d:4a41:0:0:0:0:0 with SMTP id v1csp2054596wrs; Mon, 24 Apr 2023 02:24:34 -0700 (PDT) X-Google-Smtp-Source: AKy350ajC46F0MdgbR7B6pIHqfWbGGL0d0PAQXR8LToBTOg0i5nuc8ZGa1rFh/ldn30iGthwTbph X-Received: by 2002:a05:6214:1c49:b0:5f1:5f73:aec2 with SMTP id if9-20020a0562141c4900b005f15f73aec2mr22363798qvb.32.1682328274690; Mon, 24 Apr 2023 02:24:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682328274; cv=none; d=google.com; s=arc-20160816; b=NMCDlMSyh+bQ4JHjnZg1GIowTToUtOwb3YCcqKyvmoUjLNynij85qSEiQKPeUEtWsE SkJxh9m9F6rQOQg+rGWWeNzVZldQAOTgIkrTWMIT/uR99wH1nbRQLl6GmGQ6Y804e9H6 jtPWSe5BfMp8FGrtbhpOwuEycDkAPMOv2WjTBtXSrSmFR2JraQTQEAIw2B1O2tid8TmF Zk4wOcFGWO8GapBOYRWuErzWyAxZ1Xp32mSJNggpDEdocHC/uNjJc29rZldmd9ZD8PXe aqYecTyAi/nCPfLWHseSaObfTNcIEMBPSd7KrLiRySH+nqapHVPOL4gvsdBuEnk3sqkr rT/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=o5kSB6Tp7rwswMBs6F95VrSi+MAlNKbqKile7T4KtUU=; b=UAfvQzbZiY1b9L4g705zmtAATq3dzjqRm4gPiKMNNLI60Wek7XMn6PzslN31yKKAI2 znv+DCRuGcqI91sytjioAjhS6F5cIEDUXgA5dROAJgnQ/LbW9uBRdm3Llq9J7a1+jQ6+ twfR0I05EK5DjUzbV0hSfNtL8tbjv9pOHDy1AfmaI98wmsMZPfWIiPPNQrUgsWedxVqn h72cfARauAUtrcgVOD9eICCVPjjoiFrK8eDInab+SV4FgaD2uCMTYYUeMkUfbbxTzlCx AJ97sePw9wH/bem8ydZvzsLIOaZxVYEOSmGgl1rY096xeT+os3/7i0K2DFcafBvhN5TO FZxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qvVYWTEb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6-20020ac85746000000b003ef2fcf9142si1714353qtx.210.2023.04.24.02.24.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Apr 2023 02:24: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=pass header.i=@linaro.org header.s=google header.b=qvVYWTEb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pqsQ2-0007QX-1n; Mon, 24 Apr 2023 05:23:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pqsPa-0007EK-4P for qemu-devel@nongnu.org; Mon, 24 Apr 2023 05:23:06 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pqsPP-0004m6-AZ for qemu-devel@nongnu.org; Mon, 24 Apr 2023 05:23:05 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f19323259dso30657995e9.3 for ; Mon, 24 Apr 2023 02:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682328173; x=1684920173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=o5kSB6Tp7rwswMBs6F95VrSi+MAlNKbqKile7T4KtUU=; b=qvVYWTEbTzMEbCUcUjyONZj5qjdX0zEBYSBlq85WgcFEp0yzzwxl+6MkLmDrUkOEnG 4Kej8f+Ktq24ncfu4XXVQgFLxDZuKidvxXB4ge+WjpLrd2x/Pb4hsHcUm3u78crtV/9A FWki+lMM3g7WZkLaeTnjpQ1gIWJ32OvrROD4tSJoL5imremLKx+4HkRx4cEd1rs3pJ6l rmZ9kluhnIx/oXn0/OfvSV/0PQTeL5veuORn4kxOu4lIsML4SOmotQqwIfMENO3FPKj2 JkKAZw6oR00rjGggHbAYg0ppJcIdS91dZJbi11+OFqyj23XXKYx/gIvyIFF+JrmJ9BCt TAXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682328173; x=1684920173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o5kSB6Tp7rwswMBs6F95VrSi+MAlNKbqKile7T4KtUU=; b=FFMMuZK2dM22iiaSZOjHBIQwcZNXk+aCUF9Z5ptu/X6+lejYnHOcftyFP4YQZC994Q zaiVxhl4iGNjzrP1GG0gf0//FNj31gPA0aI/RQAMtGVGHhCH2iIVfYhPacjqJHsfPGwj ttlxsk0CZ/sDUkr/EyDb0O9q0DSvzd8QMrrPG+YSZMth9LqQWT4PwciHPWcPHNhjpyzT JoFTwzaebAdppAPa3IC7Nw8aWhpjiWKnA8k+9F4x1FhCPidWgtxaSvKfcuH1cgs9Ey2J EzqY3EPpcxfPqnA4qxu07ol+ki1AWy/+jfXlBCFjkkWeRz4NC4Ir5/gmo6Uf6o5fJLHj IRiQ== X-Gm-Message-State: AAQBX9fYXcy5Lfwxrdvp/Ih1oZnYl/IqkhnyBm70JcQtvAo5OKm8i9BF JEQTNcDVvZRcGCyJasw5RxUz2Q== X-Received: by 2002:a05:600c:2214:b0:3f1:98bd:acec with SMTP id z20-20020a05600c221400b003f198bdacecmr4564123wml.11.1682328173551; Mon, 24 Apr 2023 02:22:53 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p10-20020a5d48ca000000b003047dc162f7sm1094226wrs.67.2023.04.24.02.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Apr 2023 02:22:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0CBC91FFBD; Mon, 24 Apr 2023 10:22:50 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Wainer dos Santos Moschetta , Beraldo Leal , Thomas Huth , =?utf-8?q?Alex_Benn=C3=A9e?= , "Edgar E. Iglesias" , Paolo Bonzini , Aurelien Jarno , Peter Maydell , Juan Quintela , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Richard Henderson , Joel Stanley , Leif Lindholm , Markus Armbruster , Radoslaw Biernacki , Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , John Snow , Andrew Jeffery , David Hildenbrand , Bastian Koppelmann , Max Filippov , qemu-s390x@nongnu.org, Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P=2E_Berrang=C3=A9?= , qemu-arm@nongnu.org, Eduardo Habkost , Ilya Leoshkevich , Eldon Stegall Subject: [PATCH 05/18] scripts/device-crash-test: Add a parameter to run with TCG only Date: Mon, 24 Apr 2023 10:22:36 +0100 Message-Id: <20230424092249.58552-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230424092249.58552-1-alex.bennee@linaro.org> References: <20230424092249.58552-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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth We're currently facing the problem that the device-crash-test script runs twice as long in the CI when a runner supports KVM - which sometimes results in a timeout of the CI job. To get a more deterministic runtime here, add an option to the script that allows to run it with TCG only. Reported-by: Eldon Stegall Signed-off-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230417134321.3627231-6-alex.bennee@linaro.org> Message-Id: <20230414145845.456145-3-thuth@redhat.com> Signed-off-by: Alex Bennée --- .gitlab-ci.d/buildtest.yml | 2 +- scripts/device-crash-test | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 333eea9dd3..bb3650a51c 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -103,7 +103,7 @@ crash-test-debian: script: - cd build - make NINJA=":" check-venv - - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386 + - tests/venv/bin/python3 scripts/device-crash-test -q --tcg-only ./qemu-system-i386 build-system-fedora: extends: diff --git a/scripts/device-crash-test b/scripts/device-crash-test index 73bcb98693..b74d887331 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -397,7 +397,7 @@ def binariesToTest(args, testcase): def accelsToTest(args, testcase): - if getBinaryInfo(args, testcase['binary']).kvm_available: + if getBinaryInfo(args, testcase['binary']).kvm_available and not args.tcg_only: yield 'kvm' yield 'tcg' @@ -510,6 +510,8 @@ def main(): help="Full mode: test cases that are expected to fail") parser.add_argument('--strict', action='store_true', dest='strict', help="Treat all warnings as fatal") + parser.add_argument('--tcg-only', action='store_true', dest='tcg_only', + help="Only test with TCG accelerator") parser.add_argument('qemu', nargs='*', metavar='QEMU', help='QEMU binary to run') args = parser.parse_args()