From patchwork Mon Apr 17 13:43:20 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: 673829 Delivered-To: patch@linaro.org Received: by 2002:adf:fcce:0:0:0:0:0 with SMTP id f14csp1515688wrs; Mon, 17 Apr 2023 06:45:36 -0700 (PDT) X-Google-Smtp-Source: AKy350a2Aapp9X3vlvK0OMbwwNXFmd7p6qAi3bEouY8CS6ehyjVsfsVlaiymK8zJ7NbbWBYzDwtg X-Received: by 2002:a05:6214:2583:b0:5ef:4b80:d6d with SMTP id fq3-20020a056214258300b005ef4b800d6dmr18093367qvb.11.1681739136472; Mon, 17 Apr 2023 06:45:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681739136; cv=none; d=google.com; s=arc-20160816; b=E8pJwdU6kkGFqRN/H6rl9PXIimZ/vIajyKehA5ZQvjXpmh9gPqjinMbjiwQeXY9kis uSdOL9Zhp8dm8MeIlgcRRjFuLZnhtllK62EmaiiImbqdbo+npje5yhd/nqb6xEIzz0aa ooBJcVnMiZ32GUXDXRdU2c0WSgl1HO+TSz6MAEPYA4kL6wr8mq3itx3g251rAga7l25L bWkoQToL0g5zprT3Ub9Wi/0QhA+bmUi5zYjg2Bil9hKNKHfVy1Wy87fcksRVqKiidTvm nEgNR52g4UDap5x9otW/lvWIhhg8PhCEGGSZWqQDcph6/FJf3WzJblAlbRy7PvcZEi05 yDqw== 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=dLH2QEWQqVAIoLqiAtlECXbd5H/woEL07ZUKBkfOWGo=; b=jhMRXoQ8TRHnhfGCYmhYuofJ6mDPSie9Nhct8oZtpEI5OEkUqfDrB30RPQ2TIT8YTH 1nIM68y54wZq+mHi5o8Sj08cn3hA1tfJoNYwqZoJiM16ZF+g4mle2YWTcmf/zV898X5w jdhT4JxgYje7xL44TxruFW0bVWDf2r5Ao21eGxNg6YrYSox68Ld/ibmbQTw0vQcif2za dCnedKx6hMbSgoviGBk7eo5ta5+qd0yusbqP7mJDAOeb97YstdZBy+9gd4K4EznrdaC6 Fiw+k7tLD0anI8ELD9T/2sJZ6tcpmiCJqO+dGruWD/dUJxxkYneh0pM2Pthl47V93WIR 0MXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cPEl514B; 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 c16-20020ac87dd0000000b003e387a2e7fcsi5653762qte.391.2023.04.17.06.45.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 Apr 2023 06:45:36 -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=cPEl514B; 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 1poP91-0000zd-CZ; Mon, 17 Apr 2023 09:43:47 -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 1poP8q-0000wd-2F for qemu-devel@nongnu.org; Mon, 17 Apr 2023 09:43:36 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1poP8o-0006Sd-FS for qemu-devel@nongnu.org; Mon, 17 Apr 2023 09:43:35 -0400 Received: by mail-wm1-x335.google.com with SMTP id eo6-20020a05600c82c600b003ee5157346cso15535874wmb.1 for ; Mon, 17 Apr 2023 06:43:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1681739013; x=1684331013; 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=dLH2QEWQqVAIoLqiAtlECXbd5H/woEL07ZUKBkfOWGo=; b=cPEl514BRWuzxDA3zA/4qTrTpx+6O6YrMEBxuJas7TipS1z0koqMXgnN4IvjTFkFe9 7CPptISlAq4xZ7P15AI5dfA72hYejyVZ7mmn8qiKBc6xd6X8pYHDT+J2iGRxzb5COJx4 2Agu7xDoNPnNQEDPqAmO6VPTkqF2AHz2omInEKu7kM+8amzb8m9O72xB5O+B4NWv6hw4 BYA5nPOZVbf8B8PlwrpdLqdZD4sV0olb9SloJhD5ba8GOOgLMQRYtaLg7LEB4zaJlFmx tvyPmQz+vN6Inw74T0n3Pl7MZ5OssvohtnD7qibjqv/vMRdmkhbJXj78D2L9LR2oEXwj EBzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681739013; x=1684331013; 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=dLH2QEWQqVAIoLqiAtlECXbd5H/woEL07ZUKBkfOWGo=; b=FRbo6JMV+lnfUsjVYtYyJLPauuynHqO853hxtkjvYrSjTlrOcY+jOkJsiKi/UkFqqk s8prS28leW3L91NG+nFj+w2Jcz6sBiEPQz5lsNNgcCvagcQavyUq5GF4An6GXRX5zUeU KkNFaQ7+qraDm82WY2htwsXcE6IXDWDRB+RtA1fn87rSm2JO9QajDI+KHcQZ+JWtpy/P jWGHculve2fsz5TGaR4PQMkZ8JU5aMGQfZeT6XrBambYqaY6y/t1tOWKKQumzAFIc2Vm Sy7PoVmfv7zQCupGZ/tZ7eYRUj5sdf+Tmahm5sYsSwuH6hmQ6CuopGjICSqtWd0cS7Yu bTuQ== X-Gm-Message-State: AAQBX9eVwuU9HgaE5ypg+ZHjbpAjdCvgW6haX/nWpd3T0dRjAlF0LjVh 8gu5foLV8Z4IShiYXpI8Bc9hjw== X-Received: by 2002:a7b:c4cd:0:b0:3f0:9a9d:4a0d with SMTP id g13-20020a7bc4cd000000b003f09a9d4a0dmr11504908wmk.21.1681739013135; Mon, 17 Apr 2023 06:43:33 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id iv8-20020a05600c548800b003f09e294d5esm15588497wmb.6.2023.04.17.06.43.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 06:43:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5B3BD1FFBD; Mon, 17 Apr 2023 14:43:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , Bastian Koppelmann , Markus Armbruster , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Cleber Rosa , Radoslaw Biernacki , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Leif Lindholm , John Snow , Paolo Bonzini , Wainer dos Santos Moschetta , qemu-arm@nongnu.org, Eldon Stegall Subject: [PATCH v4 5/6] scripts/device-crash-test: Add a parameter to run with TCG only Date: Mon, 17 Apr 2023 14:43:20 +0100 Message-Id: <20230417134321.3627231-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230417134321.3627231-1-alex.bennee@linaro.org> References: <20230417134321.3627231-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth 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 Message-Id: <20230414145845.456145-3-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- .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()