On Fri, Oct 31, 2025 at 01:05:41PM +0100, Dion Bosschieter wrote: > 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.
The nice thing about having both the XML & args in the same directory is that it lets us see at a glance whether there are any missing pairings. Perhaps rather than moving directory, we could rename the files where they are eg ah-linux.xml ah-linux.ebiptables.args ah-linux.nftables.args > > Signed-off-by: Dion Bosschieter <[email protected]> > --- > 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 => nwfilterxml2ebipfirewalltest.c} | 4 ++-- > 41 files changed, 3 insertions(+), 3 deletions(-) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ah-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ah-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/all-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/all-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/arp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/comment-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/conntrack-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/esp-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/esp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/example-1-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/example-2-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/hex-data-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/icmp-direction-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/icmp-direction2-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/icmp-direction3-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/icmp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/icmpv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/igmp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ip-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ipset-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ipt-no-macspoof-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/iter1-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/iter2-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/iter3-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/mac-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/rarp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/sctp-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/sctp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/stp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/target-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/target2-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/tcp-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/tcp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/udp-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/udp-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/udplite-ipv6-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/udplite-linux.args (100%) > rename tests/{nwfilterxml2firewalldata => > nwfilterxml2ebipfirewalldata}/vlan-linux.args (100%) > rename tests/{nwfilterxml2firewalltest.c => 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 += [ > { 'name': 'nwfilterebiptablestest', 'link_with': [ nwfilter_driver_impl > ] }, > - { 'name': 'nwfilterxml2firewalltest', 'link_with': [ > nwfilter_driver_impl ] }, > + { 'name': 'nwfilterxml2ebipfirewalltest', 'link_with': [ > nwfilter_driver_impl ] }, > ] > endif > > diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args > b/tests/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/tests/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/tests/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/tests/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/tests/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalldata/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/nwfilterxml2ebipfirewalltest.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) > > xml = g_strdup_printf("%s/nwfilterxml2firewalldata/%s.xml", > abs_srcdir, info->name); > - args = g_strdup_printf("%s/nwfilterxml2firewalldata/%s-%s.args", > + args = g_strdup_printf("%s/nwfilterxml2ebipfirewalldata/%s-%s.args", > abs_srcdir, info->name, RULESTYPE); > > result = testCompareXMLToArgvFiles(xml, args); > -- > 2.43.0 > With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
