From nobody Fri May 17 05:26:20 2024 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=1681206745; cv=none; d=zohomail.com; s=zohoarc; b=cT27Pid7VdnM14MTjIZHqFJ7DRGvZZh40+0yYvFyuYrJ7xkh3SjydQfj3q/zL7MHI5w27TGVAVG780r/EqU84rQiAYH8nZZT5yGO85GeNUWqAWiPGpNEJP8wV0BZKABmuCer0hby8WqZz3JkgGteu2WgpgAQGH/uud+ZRlRZ1ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681206745; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=6LsJK+u0hjzinlzbrwNlSWlqKsmlNGFYYF5ZqNMTv9U=; b=Y+NAodpSAttwR9mzfkg6WqcQgDbGiHTolW4zMkMOv7CtXiiiEKWWPe3uwNyhGjE8pUtTa5IAkTyWVKHlRXhNQoPqT9tQ9fa1SQYQutGDU/kqknZZB3BGjq86RKTPRq2/orCsI2X1iNRDAQ6F8MQiZ58Pq72SrvLXBneE4IfP6ig= 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 1681206745340154.11214891555073; Tue, 11 Apr 2023 02:52:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmAfY-0000UJ-ET; Tue, 11 Apr 2023 05:52:08 -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 1pmAfU-0000Tn-Ks for qemu-devel@nongnu.org; Tue, 11 Apr 2023 05:52:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmAfS-0006cu-GX for qemu-devel@nongnu.org; Tue, 11 Apr 2023 05:52:03 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-563-6kKZwIk7OlO5kXccpLY-Sg-1; Tue, 11 Apr 2023 05:51:58 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 204A3811E7C for ; Tue, 11 Apr 2023 09:51:58 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C2A3440D8; Tue, 11 Apr 2023 09:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681206720; 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=6LsJK+u0hjzinlzbrwNlSWlqKsmlNGFYYF5ZqNMTv9U=; b=g5CdAErlu3JseZL2MUwxT4e0tbHcrvHOKq2jIa/lEJMElNHeRfIg2GVq3iS4Ru68cvrZ6/ Mwbg6wG+LHiIao0JMonPJhaohHpr+tmYuLO3P2TDb1wSkHLtojJvxA7B376TyyEj/Cw/Xh iNqvgmNy1/5mUPgQyKTuBVDNr/nOx9c= X-MC-Unique: 6kKZwIk7OlO5kXccpLY-Sg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Juan Quintela Subject: [PATCH v2] test: Fix test-crypto-secret when compiling without keyring support Date: Tue, 11 Apr 2023 11:51:56 +0200 Message-Id: <20230411095156.6500-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=-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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1681206746351100001 Content-Type: text/plain; charset="utf-8" Linux keyring support is protected by CONFIG_KEYUTILS. We also need CONFIG_SECRET_KEYRING. Signed-off-by: Juan Quintela --- - Previous version of this patch changed the meson build rules. Daniel told me that the proper fix was to change the #ifdef test. - Change rule again. We need both defines. - Now it passes the test with and without CONFIG_SECRET_KEYRING defined --- tests/unit/test-crypto-secret.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/unit/test-crypto-secret.c b/tests/unit/test-crypto-secre= t.c index 34a4aecc12..d31d97f36a 100644 --- a/tests/unit/test-crypto-secret.c +++ b/tests/unit/test-crypto-secret.c @@ -24,7 +24,7 @@ #include "crypto/secret.h" #include "qapi/error.h" #include "qemu/module.h" -#ifdef CONFIG_KEYUTILS +#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING) #include "crypto/secret_keyring.h" #include #endif @@ -128,7 +128,7 @@ static void test_secret_indirect_emptyfile(void) g_free(fname); } =20 -#ifdef CONFIG_KEYUTILS +#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING) =20 #define DESCRIPTION "qemu_test_secret" #define PAYLOAD "Test Payload" @@ -268,7 +268,7 @@ static void test_secret_keyring_bad_key_access_right(vo= id) keyctl_unlink(key, KEY_SPEC_PROCESS_KEYRING); } =20 -#endif /* CONFIG_KEYUTILS */ +#endif /* CONFIG_KEYUTILS && CONFIG_SECRET_KEYRING */ =20 static void test_secret_noconv_base64_good(void) { @@ -571,7 +571,7 @@ int main(int argc, char **argv) g_test_add_func("/crypto/secret/indirect/emptyfile", test_secret_indirect_emptyfile); =20 -#ifdef CONFIG_KEYUTILS +#if defined(CONFIG_KEYUTILS) && defined(CONFIG_SECRET_KEYRING) g_test_add_func("/crypto/secret/keyring/good", test_secret_keyring_good); g_test_add_func("/crypto/secret/keyring/revoked_key", @@ -582,7 +582,7 @@ int main(int argc, char **argv) test_secret_keyring_bad_serial_key); g_test_add_func("/crypto/secret/keyring/bad_key_access_right", test_secret_keyring_bad_key_access_right); -#endif /* CONFIG_KEYUTILS */ +#endif /* CONFIG_SECRET_KEYRING */ =20 g_test_add_func("/crypto/secret/noconv/base64/good", test_secret_noconv_base64_good); --=20 2.39.2