From mboxrd@z Thu Jan 1 00:00:00 1970 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 200C4C433E0 for ; Thu, 11 Mar 2021 23:16:25 +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 9E59F64F94 for ; Thu, 11 Mar 2021 23:16:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E59F64F94 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKUXX-0007UB-LG for qemu-devel@archiver.kernel.org; Thu, 11 Mar 2021 18:16:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKUTv-0001n3-Sb for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:34191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKUTj-000533-1q for qemu-devel@nongnu.org; Thu, 11 Mar 2021 18:12:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615504344; 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=nCMOis7blvx2AGe7FC9c1Tgf4rXmZrQipdbYJNU+L/o=; b=bkMEq8IK9Wnm9f1tJ2hKI7jZAsQbzD/BExQ/XfsRwazQj6F3895AlBpIE3TD3CEoUvcR6D JdFq12VU0IHwkFcst48tYSJsJGSkQf/nrfi5obCoHzV/Hr311v2FgFfdVguVSI1UM4WypL Sq+xKiRfFd56/foxuSa71EcwOPBiJxI= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-542-swLpa81BPMahMiAisMIafQ-1; Thu, 11 Mar 2021 18:12:22 -0500 X-MC-Unique: swLpa81BPMahMiAisMIafQ-1 Received: by mail-wr1-f69.google.com with SMTP id p12so7652773wrn.18 for ; Thu, 11 Mar 2021 15:12:22 -0800 (PST) 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=nCMOis7blvx2AGe7FC9c1Tgf4rXmZrQipdbYJNU+L/o=; b=e3BbFM6wGQkS4d8ocXkEEHAPU66eYU4J3+8nzGqP3rQ+G2i9eCjBm9ARB2gqLliKbf 2AfFSbsYGh8ON/tVnt0TeqicA5MdEtf4qvA7oVx1HiHCFomhw7cfXjO5tqX92h5xi+B9 nzfEkuxDbH/KRrShjtMFSwO8w3S81zgAxx3UlsUCogwoIlZtOj2tXrT3NLS68l9LJ4xo kL93ksEL0FeS9tOAFDBUg9Nxds7UasC3A3JUOt3y+iTxk2mvZ29t/NGy+01uvYuQ5BXw W3CUsIdhujT7VhUiwvwJwynO0sreufDdRaBgK+L18NoOwUD6gTYUpEKso3JKo6DiHwCW MEnQ== X-Gm-Message-State: AOAM532M2dhu3ejjj5DMnc24V6d2RknGBZWahQtGhNQhGAXSmelsPG9B Mz8zhJud5IDmGBUsPivol7PLI3wOVwTg7FSNLfrSTTdMkCYecqHm9QT9Gmp1gE+bkiqbFcVYpSC EoEk3VfvChMuxjNjBV9U9mIl/gOw7UisXGZqgXLSHmR2H9yFVv8JFKG9uwkFY9pd5 X-Received: by 2002:a5d:68cd:: with SMTP id p13mr11500912wrw.247.1615504341270; Thu, 11 Mar 2021 15:12:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwInFVUV84B5PdSKhdE4HdFLGcMnxRBKBeaYszUKaj2EuY4HlNV4vKnqyVTihuG1/DAFujTqw== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr11500890wrw.247.1615504341101; Thu, 11 Mar 2021 15:12:21 -0800 (PST) Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id b15sm291253wmd.41.2021.03.11.15.12.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 15:12:20 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Claudio Fontana Subject: [PATCH 3/6] qtest/bios-tables-test: Make test build-independent from accelerator Date: Fri, 12 Mar 2021 00:11:59 +0100 Message-Id: <20210311231202.1536040-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210311231202.1536040-1-philmd@redhat.com> References: <20210311231202.1536040-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Laurent Vivier , Andrew Jones , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Eduardo Habkost , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Thomas Huth , Markus Armbruster , qemu-arm@nongnu.org, Paolo Bonzini , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Now than we can probe if the TCG accelerator is available at runtime with a QMP command, we can remove the #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- tests/qtest/bios-tables-test.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/qtest/bios-tables-test.c b/tests/qtest/bios-tables-test.c index e020c83d2a5..73378f9da94 100644 --- a/tests/qtest/bios-tables-test.c +++ b/tests/qtest/bios-tables-test.c @@ -718,15 +718,13 @@ static void test_acpi_one(const char *params, test_data *data) char *args; bool use_uefi = data->uefi_fl1 && data->uefi_fl2; -#ifndef CONFIG_TCG - if (data->tcg_only) { - g_test_skip("TCG disabled, skipping ACPI tcg_only test"); - return; - } -#endif /* CONFIG_TCG */ - args = test_acpi_create_args(data, params, use_uefi); data->qts = qtest_init(args); + if (data->tcg_only && !qtest_probe_accel(data->qts, "tcg")) { + g_test_skip("TCG not available, skipping test"); + goto done; + } + test_acpi_load_tables(data, use_uefi); if (getenv(ACPI_REBUILD_EXPECTED_AML)) { @@ -745,6 +743,7 @@ static void test_acpi_one(const char *params, test_data *data) test_smbios_structs(data); } +done: qtest_quit(data->qts); g_free(args); } -- 2.26.2