From nobody Mon Feb 9 23:40:02 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1654528121; cv=none; d=zohomail.com; s=zohoarc; b=JmXWblf8P1Iq2772Hngmg5Rvfo3a6QZ+Mmp3YEBqEzY5R2UKin1KMrweFbQObbFJLCUhq9GxQ28OcUZMxC7/tUUDEdBZLKBHs3MYA7o65JsMj4SmGmrag5z9ZQ7BcNxthE4r6yFyHZstOIArXSPQ3eAY4plOjyuKn41jsh/cXAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1654528121; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YbCITN4WWv2lWDs17REuqnuTLGGVSQp/qDeRaT877jU=; b=A+udTmuDmkW+qlKqHXmSDw8IAajlLZeuMHqrP7rOyRvvcBPkQ2HPMc8icgJp/3shlKGNVrgHlWNwgJoL3J64grHkSTA91q7plmHlvyXyjGvz1V209dgSvp/deDgIvpZFLzZdDakoem1V/YTWPr7ofs58WOQTUcpXrKvq3EC3Ovw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165452812126057.246644933939706; Mon, 6 Jun 2022 08:08:41 -0700 (PDT) Received: from localhost ([::1]:59056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyELP-0004Uu-Qn for importer@patchew.org; Mon, 06 Jun 2022 11:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51326) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyDrU-0002i7-SD for qemu-devel@nongnu.org; Mon, 06 Jun 2022 10:37:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53210) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyDrQ-0000fD-Vx for qemu-devel@nongnu.org; Mon, 06 Jun 2022 10:37:43 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-k0KXds0rPpKkHjW_BdkdqQ-1; Mon, 06 Jun 2022 10:37:38 -0400 Received: by mail-wr1-f72.google.com with SMTP id m18-20020adff392000000b0021848a78a53so350381wro.19 for ; Mon, 06 Jun 2022 07:37:38 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id 186-20020a1c19c3000000b0039c4ec6fdacsm3739931wmz.40.2022.06.06.07.37.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jun 2022 07:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654526259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YbCITN4WWv2lWDs17REuqnuTLGGVSQp/qDeRaT877jU=; b=N8L8bi3jDjETxUnh/ajHudZ2QJQEoSNjmBZoR4UjGOtgQsMhANZ5KEeqt1k75G+wkOnzUr oqK/6D6g2pzsJ6OsO8YsP8SvSNvVexUiT95R4urkhvKvQ00I7y5ywUPFWCKP4rFdJIjFqC BAbo8KX1dPreMClSjyoQOWLa/aNRbWg= X-MC-Unique: k0KXds0rPpKkHjW_BdkdqQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YbCITN4WWv2lWDs17REuqnuTLGGVSQp/qDeRaT877jU=; b=y/dpm2kZf1Y0k1I5SzSA3TuXN6KNZCqee6G958cRRDzR4+Iu93N6/ZwIW7GEWq2sJy u+YEuIsCmdqdTslBQIw8cWSLta+ztWcteM/cTtUhyx7VyHv6YoF46TFfJyR3jPVoz9ym k58FdvWQf+M9lLGZBA95sZFRVm5BL5htXltdANZEDPpyuC9TIluZyCGN+KzUMYV8joDR rv0GUUnvrzSjFJXAoCifA8PmJ/N5lNavJ2z20UDXOsycrOB+OMJlXjFIAtf85Nzlj6pU gY0LBcBUEXM6IrSnWKZ6xiiDGgmhI7XPAnODAo/ofNWtJpbhU3LoPNIiQ57OO5n+qDbd 9f1w== X-Gm-Message-State: AOAM530Awuvmfb+M0JCd2HgpkjYA35HPohrZdSPG/jqfebEkBPS2n2l1 9TVeFEejbnPezdh4e4QA3Y/cI9TcrNbgwireQLvo2YrHPq4xiIp5i0Ofr8/qePJOW9AqKji5M25 aGomYm1tMOT7rccTX2NYquETo4OvPWnPRoBIc5uMpFZfLpchgLNdUYMp9G4m05uSMsWs= X-Received: by 2002:a05:600c:20e:b0:397:697f:172b with SMTP id 14-20020a05600c020e00b00397697f172bmr52867525wmi.84.1654526256043; Mon, 06 Jun 2022 07:37:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFlvRh3T+AJ2NqPMByRmAQyqWjz7ZoP5TqZoBHfW1m2Qdf7fu11UaY6gQsRv6YE4SvqzQYxQ== X-Received: by 2002:a05:600c:20e:b0:397:697f:172b with SMTP id 14-20020a05600c020e00b00397697f172bmr52867480wmi.84.1654526255651; Mon, 06 Jun 2022 07:37:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: John Snow Subject: [PULL 26/29] tests: run 'device-crash-test' from tests/venv Date: Mon, 6 Jun 2022 16:36:41 +0200 Message-Id: <20220606143644.1151112-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220606143644.1151112-1-pbonzini@redhat.com> References: <20220606143644.1151112-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1654528121933100001 Content-Type: text/plain; charset="utf-8" From: John Snow Remove the sys.path hacking from device-crash-test, and add in a little user-friendly message for anyone who was used to running this script directly from the source tree. Modify the GitLab job recipes to create the tests/venv first, then run device-crash-test from that venv. Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Message-Id: <20220526000921.1581503-10-jsnow@redhat.com> Signed-off-by: Paolo Bonzini --- .gitlab-ci.d/buildtest.yml | 8 +++++--- scripts/device-crash-test | 14 +++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index ecac3ec50c..544385f5be 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -110,7 +110,8 @@ crash-test-debian: IMAGE: debian-amd64 script: - cd build - - scripts/device-crash-test -q ./qemu-system-i386 + - make check-venv + - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i3= 86 =20 build-system-fedora: extends: .native_build_job_template @@ -155,8 +156,9 @@ crash-test-fedora: IMAGE: fedora script: - cd build - - scripts/device-crash-test -q ./qemu-system-ppc - - scripts/device-crash-test -q ./qemu-system-riscv32 + - make check-venv + - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc + - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-ri= scv32 =20 build-system-centos: extends: .native_build_job_template diff --git a/scripts/device-crash-test b/scripts/device-crash-test index a203b3fdea..73bcb98693 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -33,10 +33,18 @@ import re import random import argparse from itertools import chain +from pathlib import Path =20 -sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu.machine import QEMUMachine -from qemu.qmp import ConnectError +try: + from qemu.machine import QEMUMachine + from qemu.qmp import ConnectError +except ModuleNotFoundError as exc: + path =3D Path(__file__).resolve() + print(f"Module '{exc.name}' not found.") + print(" Try 'make check-venv' from your build directory,") + print(" and then one way to run this script is like so:") + print(f' > $builddir/tests/venv/bin/python3 "{path}"') + sys.exit(1) =20 logger =3D logging.getLogger('device-crash-test') dbg =3D logger.debug --=20 2.36.1