From patchwork Mon Feb 19 12:39:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 13562601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 08A73C48BC3 for ; Mon, 19 Feb 2024 12:39:41 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rc2vO-0003xJ-Op; Mon, 19 Feb 2024 07:39:11 -0500 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 1rc2vN-0003ui-GF for qemu-devel@nongnu.org; Mon, 19 Feb 2024 07:39:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rc2vM-0005cC-4R for qemu-devel@nongnu.org; Mon, 19 Feb 2024 07:39:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1708346347; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=3oFbcvpRF1rNYkn71lUAsYodJVzk0jREHGF78x2FdM0=; b=dXPNwmZnrwA/53uVXD2Z61o21jtcL/d1rBLgPpB+QEMAyaGlEAWUSAOyiP0cMHrPi9QN1s HDPoSIA26xBWbECPmEGaiijoU8BA6o4ZbVV2hWSjTaIyhBuXiS/L1uBCUSgYzEU62I3hIz lAwm/Jak2iUg9D2PbwMP2Zs+xicArqc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-350-LnLRdu6RMySsIERmYIeEvw-1; Mon, 19 Feb 2024 07:39:04 -0500 X-MC-Unique: LnLRdu6RMySsIERmYIeEvw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id EAFB72932484; Mon, 19 Feb 2024 12:39:03 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id E04F41BDD1; Mon, 19 Feb 2024 12:39:01 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= Subject: [PATCH] tests/qtest: Don't run the dbus-display-test without CONFIG_VGA_PCI Date: Mon, 19 Feb 2024 13:39:00 +0100 Message-ID: <20240219123900.430943-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@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.072, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org When compiling with "configure --without-default-devices", the dbus-display-test fails since it implicitly assumes that the machine comes with the standard VGA card. Thus add a check to meson.build to disable the test if the VGA card is not available. Signed-off-by: Thomas Huth --- tests/qtest/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 2b89e8634b..c8e6d7df40 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -108,7 +108,7 @@ qtests_i386 = \ 'numa-test' ] -if dbus_display +if dbus_display and config_all_devices.has_key('CONFIG_VGA_PCI') qtests_i386 += ['dbus-display-test'] endif