From nobody Sat Feb 7 05:49:54 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1700650281480348.9585092749078; Wed, 22 Nov 2023 02:51:21 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id CB69E18A4; Wed, 22 Nov 2023 05:51:19 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id BA4FA17DF; Wed, 22 Nov 2023 05:50:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D502717E2; Wed, 22 Nov 2023 05:50:00 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 16BE917C2 for ; Wed, 22 Nov 2023 05:50:00 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-664-Vi-E3ghDPNeYiGX3hAtNkA-1; Wed, 22 Nov 2023 05:49:58 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 24C9F185A780 for ; Wed, 22 Nov 2023 10:49:58 +0000 (UTC) Received: from maggie.brq.redhat.com (unknown [10.43.3.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id C4B9B2026D4C for ; Wed, 22 Nov 2023 10:49:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Vi-E3ghDPNeYiGX3hAtNkA-1 From: Michal Privoznik To: devel@lists.libvirt.org Subject: [PATCH 2/2] nwfilterxml2firewalltest: Use virqsortmock for stable sorting Date: Wed, 22 Nov 2023 11:49:55 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: MOQIVMJBUK4ZECDGZA2HIY2OEW7F6UD5 X-Message-ID-Hash: MOQIVMJBUK4ZECDGZA2HIY2OEW7F6UD5 X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8"; x-default="true" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1700650282570100001 The way that nwfilterxml2firewalltest works is: it loads a NWFilter XML from a file, parses it and then calls ebiptablesApplyNewRules() recording all commands that would be executed when instantiating the rule. This is then compared to expected output. But the very first thing that ebiptablesApplyNewRules() does, it calls qsort() to sort the rules. But with new glibc, qsort() is not stable anymore and thus the order in which two rules with equal priorities are applied is not guaranteed. Use qsort() from virqsortmock which produces stable results. Signed-off-by: Michal Privoznik --- tests/nwfilterxml2firewalltest.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2firewallt= est.c index b78b1b7947..8dadc50054 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2firewalltest.c @@ -461,7 +461,9 @@ mymain(void) return ret =3D=3D 0 ? EXIT_SUCCESS : EXIT_FAILURE; } =20 -VIR_TEST_MAIN_PRELOAD(mymain, VIR_TEST_MOCK("virfirewall")) +VIR_TEST_MAIN_PRELOAD(mymain, + VIR_TEST_MOCK("virqsort"), + VIR_TEST_MOCK("virfirewall")) =20 #else /* ! defined (__linux__) */ =20 --=20 2.41.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org