From nobody Fri Dec 12 15:15:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1761912665; cv=none; d=zohomail.com; s=zohoarc; b=cztlbJqeQezMN9WKXxyUM92WGg2qH5n9wu56LIkmFKt3QNdTbp6vUuD9GrUwnz3VLBiisJ7TQ9EO5S0rdozvymmCTdI9HVbtpxYeYuUE+HBK9DzX+Jk8cHy5PyqGWIxBZF5CaKeeXpZSaGVwAYJwlwmmBqYnZZ6Onpd28BmyRbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761912665; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=p9q6xHtQ6x7cBSaJ4wlBfzbxbv4W322uiJv+GjtZHrw=; b=CxPIdKzrMCL6N7/tSUMyNYJeguxsP2W+3ByufrXZPO15zEuEcVrNhYJTRnVRnXZHTi/XNMO2IRPc/GcPjy5AF4lpR1Z36p2ebxRvxYhTn2IwGUltsGH258+WsEVQvy+QSERwuzaIoUE0AREzntZDi9+veHwr/T+bD5XFD8D7wIA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 176191266507520.821133836478793; Fri, 31 Oct 2025 05:11:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5FFC043F2D; Fri, 31 Oct 2025 08:11:04 -0400 (EDT) Received: from [172.19.199.29] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id EDF5744013; Fri, 31 Oct 2025 08:08:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 4F96843E56; Fri, 31 Oct 2025 08:07:52 -0400 (EDT) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 62F9041A3C for ; Fri, 31 Oct 2025 08:07:49 -0400 (EDT) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-b6d53684cfdso459968466b.0 for ; Fri, 31 Oct 2025 05:07:49 -0700 (PDT) Received: from thinkiepadje.home (2a02-a470-a384-0-62ef-bf5-dc71-bd78.fixed6.kpn.net. [2a02:a470:a384:0:62ef:bf5:dc71:bd78]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b70779ddf48sm158255866b.32.2025.10.31.05.07.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Oct 2025 05:07:47 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761912468; x=1762517268; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p9q6xHtQ6x7cBSaJ4wlBfzbxbv4W322uiJv+GjtZHrw=; b=aH1VYHiERk2g+Tk23WB9HcGReuNMyFYUGd4FrymjGCM3T5fFYoom0uxI+wP0Ln17m+ mpz0AvWIgsa5UakFtax8T8KYnxLjZkIexImMMiqshyV51iN9ylcxrLJiPNosyQPEBXVZ LUJb6HjesuJG4UFQ0JqfcIuR2u81KuFM2oZmtIkht9Gd9Yyv0nlzz9XGsbd8b/2h4hj8 VA6UxM7funPrGyOWAWoeMJDMrazKBSu1jE8Ostm2neuruutP3av6QgxJ8lxuxM9xsWte L175LDbbBLZkcpYX1h4rdxfqoDxfFtZbCx1m6eIs+92Cs2pOTHdVVgYuExVru4VnBRtC xq/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761912468; x=1762517268; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p9q6xHtQ6x7cBSaJ4wlBfzbxbv4W322uiJv+GjtZHrw=; b=QXW9Nh/F+U0npw+Llw4qy+O71lJYpchRB5fugPKhp4FC/SSmF1ipBeNDM0eJeRxLjz sjjvdeJwrLsKX/piSxYzqCyp3NrG60lxxuz8RZyUEqim0H9vrgNp35I5GDvNeqrdmlX2 0xK1YF/dG4Sb9OEmnRw7stCTUPueeJ882weIavl8BAsFMWFohUe3sTS3nFiQ4VZNUtee 4azCigPHc6EkvoCKUl6S20kW8v5Mp8D0Clovpn9TivjUxC6/q4Ex58PFN8aU7cpVIAPx imEujaUnL8zbf1tZvMXbqJJyQ9ZH141BNEvDDr+VySUb5OIDBxshDfLr6k4Nx/EOrhX3 MBSg== X-Gm-Message-State: AOJu0Yx6GtVu/c5WrIx8e6XjIxa1s8ymhWMK1RjKNCpOIr3wLADK3ikd 8OPiNJCMIACVgIPxVUoo0wWHT1i+c64M7SCHfmNgdtEkhkUpq9cIbD2xNiJNpQ3F1w== X-Gm-Gg: ASbGncvhsOIpCttM3yD7auU7pPw7bWMStZkbKs9LkMGo8UWr9o1lu81doLvFJ+xpmMJ IZna1PqGWVo0i0jE01Y+jrGqrPjsl6/dzppR7HiQ1MEWnUy1E+P+vsD/A1jIHZ5kuLPwt+n4KRs Bj0drAhwe9JmFKjIg5ZRKH267w0cw3ZEKKmvxojo69ZNTjjmu2E3i83em6ESOd8IKg9jbCfDRRj mKxZCBRxmaRbuU2xCBoWthFR+64NVUcPMFcDLHVzI3kmIg/K/wQ7vOrEJ6FgPME5RDkbslqSH9z cevnbaWVPa17CMo2QzcpNW3dP/ibEPskXYn4yxFtXUafcyLk3Z4CwpM8EbMPqShetiJDJfDdwwa 8LzDncF1Tpzy14TkzbMzv9h4ZJAJmelgdTKbdVOql2nuoJBVhDysGCewarxfAMgUL1/q0hJBLJN oXZssD+laB03hx9V2oOJaBZMGicc4Gb/ly8QFoxESB1F2AaxGiWYi37QMIAjWB9cnvhHXx1pE= X-Google-Smtp-Source: AGHT+IFPk19oZP0oHYSgebN4cLA7XyiN/2JBxEdlN1lmW7HPhR19APWWc390f90QbmoggVl/mC2f8Q== X-Received: by 2002:a17:907:868b:b0:b6e:2935:9285 with SMTP id a640c23a62f3a-b7070870cdemr312624266b.59.1761912467714; Fri, 31 Oct 2025 05:07:47 -0700 (PDT) From: Dion Bosschieter To: devel@lists.libvirt.org Subject: [PATCH 1/5] nwfilter: rename ebiptables unit tests and data files Date: Fri, 31 Oct 2025 13:05:41 +0100 Message-ID: <20251031120546.942126-2-dionbosschieter@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251031120546.942126-1-dionbosschieter@gmail.com> References: <20251031120546.942126-1-dionbosschieter@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FTIVOXNWUWQYO6OXAPEG5WM774K2IRBN X-Message-ID-Hash: FTIVOXNWUWQYO6OXAPEG5WM774K2IRBN X-MailFrom: dionbosschieter@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: jean-louis@dupond.be, Dion Bosschieter X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1761912668796154100 Content-Type: text/plain; charset="utf-8" Prepare for introduction of nwfilter nftables driver test files. Create new nwfilterxml2ebipfirewalldata directory for nwfilter ebiptables driver specific test files. This way we split off the xml test data from the argument test files, which are driver specific. Signed-off-by: Dion Bosschieter --- tests/meson.build | 2 +- .../ah-ipv6-linux.args | 0 .../ah-linux.args | 0 .../all-ipv6-linux.args | 0 .../all-linux.args | 0 .../arp-linux.args | 0 .../comment-linux.args | 0 .../conntrack-linux.args | 0 .../esp-ipv6-linux.args | 0 .../esp-linux.args | 0 .../example-1-linux.args | 0 .../example-2-linux.args | 0 .../hex-data-linux.args | 0 .../icmp-direction-linux.args | 0 .../icmp-direction2-linux.args | 0 .../icmp-direction3-linux.args | 0 .../icmp-linux.args | 0 .../icmpv6-linux.args | 0 .../igmp-linux.args | 0 .../ip-linux.args | 0 .../ipset-linux.args | 0 .../ipt-no-macspoof-linux.args | 0 .../ipv6-linux.args | 0 .../iter1-linux.args | 0 .../iter2-linux.args | 0 .../iter3-linux.args | 0 .../mac-linux.args | 0 .../rarp-linux.args | 0 .../sctp-ipv6-linux.args | 0 .../sctp-linux.args | 0 .../stp-linux.args | 0 .../target-linux.args | 0 .../target2-linux.args | 0 .../tcp-ipv6-linux.args | 0 .../tcp-linux.args | 0 .../udp-ipv6-linux.args | 0 .../udp-linux.args | 0 .../udplite-ipv6-linux.args | 0 .../udplite-linux.args | 0 .../vlan-linux.args | 0 ...ilterxml2firewalltest.c =3D> nwfilterxml2ebipfirewalltest.c} | 4 ++-- 41 files changed, 3 insertions(+), 3 deletions(-) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ah-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ah-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= all-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= all-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= arp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= comment-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= conntrack-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= esp-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= esp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= example-1-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= example-2-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= hex-data-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= icmp-direction-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= icmp-direction2-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= icmp-direction3-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= icmp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= icmpv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= igmp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ip-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ipset-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ipt-no-macspoof-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= iter1-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= iter2-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= iter3-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= mac-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= rarp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= sctp-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= sctp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= stp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= target-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= target2-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= tcp-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= tcp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= udp-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= udp-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= udplite-ipv6-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= udplite-linux.args (100%) rename tests/{nwfilterxml2firewalldata =3D> nwfilterxml2ebipfirewalldata}/= vlan-linux.args (100%) rename tests/{nwfilterxml2firewalltest.c =3D> nwfilterxml2ebipfirewalltest= .c} (99%) diff --git a/tests/meson.build b/tests/meson.build index 0d76d37959..383a38a6ea 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -436,7 +436,7 @@ endif if conf.has('WITH_NWFILTER') tests +=3D [ { 'name': 'nwfilterebiptablestest', 'link_with': [ nwfilter_driver_imp= l ] }, - { 'name': 'nwfilterxml2firewalltest', 'link_with': [ nwfilter_driver_i= mpl ] }, + { 'name': 'nwfilterxml2ebipfirewalltest', 'link_with': [ nwfilter_driv= er_impl ] }, ] endif =20 diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfi= lterxml2ebipfirewalldata/ah-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ah-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ah-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/ah-linux.args b/tests/nwfilterx= ml2ebipfirewalldata/ah-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ah-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ah-linux.args diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwf= ilterxml2ebipfirewalldata/all-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/all-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/all-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/all-linux.args b/tests/nwfilter= xml2ebipfirewalldata/all-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/all-linux.args rename to tests/nwfilterxml2ebipfirewalldata/all-linux.args diff --git a/tests/nwfilterxml2firewalldata/arp-linux.args b/tests/nwfilter= xml2ebipfirewalldata/arp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/arp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/arp-linux.args diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfi= lterxml2ebipfirewalldata/comment-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/comment-linux.args rename to tests/nwfilterxml2ebipfirewalldata/comment-linux.args diff --git a/tests/nwfilterxml2firewalldata/conntrack-linux.args b/tests/nw= filterxml2ebipfirewalldata/conntrack-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/conntrack-linux.args rename to tests/nwfilterxml2ebipfirewalldata/conntrack-linux.args diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwf= ilterxml2ebipfirewalldata/esp-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/esp-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/esp-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/esp-linux.args b/tests/nwfilter= xml2ebipfirewalldata/esp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/esp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/esp-linux.args diff --git a/tests/nwfilterxml2firewalldata/example-1-linux.args b/tests/nw= filterxml2ebipfirewalldata/example-1-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/example-1-linux.args rename to tests/nwfilterxml2ebipfirewalldata/example-1-linux.args diff --git a/tests/nwfilterxml2firewalldata/example-2-linux.args b/tests/nw= filterxml2ebipfirewalldata/example-2-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/example-2-linux.args rename to tests/nwfilterxml2ebipfirewalldata/example-2-linux.args diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwf= ilterxml2ebipfirewalldata/hex-data-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/hex-data-linux.args rename to tests/nwfilterxml2ebipfirewalldata/hex-data-linux.args diff --git a/tests/nwfilterxml2firewalldata/icmp-direction-linux.args b/tes= ts/nwfilterxml2ebipfirewalldata/icmp-direction-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/icmp-direction-linux.args rename to tests/nwfilterxml2ebipfirewalldata/icmp-direction-linux.args diff --git a/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args b/te= sts/nwfilterxml2ebipfirewalldata/icmp-direction2-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/icmp-direction2-linux.args rename to tests/nwfilterxml2ebipfirewalldata/icmp-direction2-linux.args diff --git a/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args b/te= sts/nwfilterxml2ebipfirewalldata/icmp-direction3-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/icmp-direction3-linux.args rename to tests/nwfilterxml2ebipfirewalldata/icmp-direction3-linux.args diff --git a/tests/nwfilterxml2firewalldata/icmp-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/icmp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/icmp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/icmp-linux.args diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfil= terxml2ebipfirewalldata/icmpv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/icmpv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/icmpv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/igmp-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/igmp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/igmp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/igmp-linux.args diff --git a/tests/nwfilterxml2firewalldata/ip-linux.args b/tests/nwfilterx= ml2ebipfirewalldata/ip-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ip-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ip-linux.args diff --git a/tests/nwfilterxml2firewalldata/ipset-linux.args b/tests/nwfilt= erxml2ebipfirewalldata/ipset-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ipset-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ipset-linux.args diff --git a/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args b/te= sts/nwfilterxml2ebipfirewalldata/ipt-no-macspoof-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ipt-no-macspoof-linux.args diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/iter1-linux.args b/tests/nwfilt= erxml2ebipfirewalldata/iter1-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/iter1-linux.args rename to tests/nwfilterxml2ebipfirewalldata/iter1-linux.args diff --git a/tests/nwfilterxml2firewalldata/iter2-linux.args b/tests/nwfilt= erxml2ebipfirewalldata/iter2-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/iter2-linux.args rename to tests/nwfilterxml2ebipfirewalldata/iter2-linux.args diff --git a/tests/nwfilterxml2firewalldata/iter3-linux.args b/tests/nwfilt= erxml2ebipfirewalldata/iter3-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/iter3-linux.args rename to tests/nwfilterxml2ebipfirewalldata/iter3-linux.args diff --git a/tests/nwfilterxml2firewalldata/mac-linux.args b/tests/nwfilter= xml2ebipfirewalldata/mac-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/mac-linux.args rename to tests/nwfilterxml2ebipfirewalldata/mac-linux.args diff --git a/tests/nwfilterxml2firewalldata/rarp-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/rarp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/rarp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/rarp-linux.args diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nw= filterxml2ebipfirewalldata/sctp-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/sctp-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/sctp-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/sctp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/sctp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/sctp-linux.args diff --git a/tests/nwfilterxml2firewalldata/stp-linux.args b/tests/nwfilter= xml2ebipfirewalldata/stp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/stp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/stp-linux.args diff --git a/tests/nwfilterxml2firewalldata/target-linux.args b/tests/nwfil= terxml2ebipfirewalldata/target-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/target-linux.args rename to tests/nwfilterxml2ebipfirewalldata/target-linux.args diff --git a/tests/nwfilterxml2firewalldata/target2-linux.args b/tests/nwfi= lterxml2ebipfirewalldata/target2-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/target2-linux.args rename to tests/nwfilterxml2ebipfirewalldata/target2-linux.args diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwf= ilterxml2ebipfirewalldata/tcp-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/tcp-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/tcp-linux.args b/tests/nwfilter= xml2ebipfirewalldata/tcp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/tcp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/tcp-linux.args diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwf= ilterxml2ebipfirewalldata/udp-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/udp-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/udp-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/udp-linux.args b/tests/nwfilter= xml2ebipfirewalldata/udp-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/udp-linux.args rename to tests/nwfilterxml2ebipfirewalldata/udp-linux.args diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests= /nwfilterxml2ebipfirewalldata/udplite-ipv6-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args rename to tests/nwfilterxml2ebipfirewalldata/udplite-ipv6-linux.args diff --git a/tests/nwfilterxml2firewalldata/udplite-linux.args b/tests/nwfi= lterxml2ebipfirewalldata/udplite-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/udplite-linux.args rename to tests/nwfilterxml2ebipfirewalldata/udplite-linux.args diff --git a/tests/nwfilterxml2firewalldata/vlan-linux.args b/tests/nwfilte= rxml2ebipfirewalldata/vlan-linux.args similarity index 100% rename from tests/nwfilterxml2firewalldata/vlan-linux.args rename to tests/nwfilterxml2ebipfirewalldata/vlan-linux.args diff --git a/tests/nwfilterxml2firewalltest.c b/tests/nwfilterxml2ebipfirew= alltest.c similarity index 99% rename from tests/nwfilterxml2firewalltest.c rename to tests/nwfilterxml2ebipfirewalltest.c index 88ba15677d..2cb100cca7 100644 --- a/tests/nwfilterxml2firewalltest.c +++ b/tests/nwfilterxml2ebipfirewalltest.c @@ -1,5 +1,5 @@ /* - * nwfilterxml2firewalltest.c: Test iptables rule generation + * nwfilterxml2ebipfirewalltest.c: Test iptables rule generation * * Copyright (C) 2014 Red Hat, Inc. * @@ -418,7 +418,7 @@ testCompareXMLToIPTablesHelper(const void *data) =20 xml =3D g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", abs_srcdir, info->name); - args =3D g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", + args =3D g_strdup_printf("%s/nwfilterxml2ebipfirewalldata/%s-%s.args", abs_srcdir, info->name, RULESTYPE); =20 result =3D testCompareXMLToArgvFiles(xml, args); --=20 2.43.0