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 <dionbosschieter@gmail.com>
---
 tests/meson.build                                             | 2 +-
 ...ilterxml2firewalltest.c => nwfilterxml2ebipfirewalltest.c} | 4 ++--
 .../{ah-ipv6-linux.args => ah-ipv6-linux.ebiptables.args}     | 0
 .../{ah-linux.args => ah-linux.ebiptables.args}               | 0
 .../{all-ipv6-linux.args => all-ipv6-linux.ebiptables.args}   | 0
 .../{all-linux.args => all-linux.ebiptables.args}             | 0
 .../{arp-linux.args => arp-linux.ebiptables.args}             | 0
 .../{comment-linux.args => comment-linux.ebiptables.args}     | 0
 .../{conntrack-linux.args => conntrack-linux.ebiptables.args} | 0
 .../{esp-ipv6-linux.args => esp-ipv6-linux.ebiptables.args}   | 0
 .../{esp-linux.args => esp-linux.ebiptables.args}             | 0
 .../{example-1-linux.args => example-1-linux.ebiptables.args} | 0
 .../{example-2-linux.args => example-2-linux.ebiptables.args} | 0
 .../{hex-data-linux.args => hex-data-linux.ebiptables.args}   | 0
 ...ection-linux.args => icmp-direction-linux.ebiptables.args} | 0
 ...tion2-linux.args => icmp-direction2-linux.ebiptables.args} | 0
 ...tion3-linux.args => icmp-direction3-linux.ebiptables.args} | 0
 .../{icmp-linux.args => icmp-linux.ebiptables.args}           | 0
 .../{icmpv6-linux.args => icmpv6-linux.ebiptables.args}       | 0
 .../{igmp-linux.args => igmp-linux.ebiptables.args}           | 0
 .../{ip-linux.args => ip-linux.ebiptables.args}               | 0
 .../{ipset-linux.args => ipset-linux.ebiptables.args}         | 0
 ...spoof-linux.args => ipt-no-macspoof-linux.ebiptables.args} | 0
 .../{ipv6-linux.args => ipv6-linux.ebiptables.args}           | 0
 .../{iter1-linux.args => iter1-linux.ebiptables.args}         | 0
 .../{iter2-linux.args => iter2-linux.ebiptables.args}         | 0
 .../{iter3-linux.args => iter3-linux.ebiptables.args}         | 0
 .../{mac-linux.args => mac-linux.ebiptables.args}             | 0
 .../{rarp-linux.args => rarp-linux.ebiptables.args}           | 0
 .../{sctp-ipv6-linux.args => sctp-ipv6-linux.ebiptables.args} | 0
 .../{sctp-linux.args => sctp-linux.ebiptables.args}           | 0
 .../{stp-linux.args => stp-linux.ebiptables.args}             | 0
 .../{target-linux.args => target-linux.ebiptables.args}       | 0
 .../{target2-linux.args => target2-linux.ebiptables.args}     | 0
 .../{tcp-ipv6-linux.args => tcp-ipv6-linux.ebiptables.args}   | 0
 .../{tcp-linux.args => tcp-linux.ebiptables.args}             | 0
 .../{udp-ipv6-linux.args => udp-ipv6-linux.ebiptables.args}   | 0
 .../{udp-linux.args => udp-linux.ebiptables.args}             | 0
 ...ite-ipv6-linux.args => udplite-ipv6-linux.ebiptables.args} | 0
 .../{udplite-linux.args => udplite-linux.ebiptables.args}     | 0
 .../{vlan-linux.args => vlan-linux.ebiptables.args}           | 0
 41 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/{nwfilterxml2firewalltest.c => nwfilterxml2ebipfirewalltest.c} (99%)
 rename tests/nwfilterxml2firewalldata/{ah-ipv6-linux.args => ah-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{ah-linux.args => ah-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{all-ipv6-linux.args => all-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{all-linux.args => all-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{arp-linux.args => arp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{comment-linux.args => comment-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{conntrack-linux.args => conntrack-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{esp-ipv6-linux.args => esp-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{esp-linux.args => esp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{example-1-linux.args => example-1-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{example-2-linux.args => example-2-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{hex-data-linux.args => hex-data-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{icmp-direction-linux.args => icmp-direction-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{icmp-direction2-linux.args => icmp-direction2-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{icmp-direction3-linux.args => icmp-direction3-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{icmp-linux.args => icmp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{icmpv6-linux.args => icmpv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{igmp-linux.args => igmp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{ip-linux.args => ip-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{ipset-linux.args => ipset-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{ipt-no-macspoof-linux.args => ipt-no-macspoof-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{ipv6-linux.args => ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{iter1-linux.args => iter1-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{iter2-linux.args => iter2-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{iter3-linux.args => iter3-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{mac-linux.args => mac-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{rarp-linux.args => rarp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{sctp-ipv6-linux.args => sctp-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{sctp-linux.args => sctp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{stp-linux.args => stp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{target-linux.args => target-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{target2-linux.args => target2-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{tcp-ipv6-linux.args => tcp-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{tcp-linux.args => tcp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{udp-ipv6-linux.args => udp-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{udp-linux.args => udp-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{udplite-ipv6-linux.args => udplite-ipv6-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{udplite-linux.args => udplite-linux.ebiptables.args} (100%)
 rename tests/nwfilterxml2firewalldata/{vlan-linux.args => vlan-linux.ebiptables.args} (100%)

diff --git a/tests/meson.build b/tests/meson.build
index 1f73d6c029..b963047732 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -443,7 +443,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/nwfilterxml2firewalltest.c b/tests/nwfilterxml2ebipfirewalltest.c
similarity index 99%
rename from tests/nwfilterxml2firewalltest.c
rename to tests/nwfilterxml2ebipfirewalltest.c
index 88ba15677d..b5a89f4fb1 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/nwfilterxml2firewalldata/%s-%s.ebiptables.args",
                            abs_srcdir, info->name, RULESTYPE);
 
     result = testCompareXMLToArgvFiles(xml, args);
diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/ah-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/ah-linux.args b/tests/nwfilterxml2firewalldata/ah-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ah-linux.args
rename to tests/nwfilterxml2firewalldata/ah-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/all-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/all-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/all-linux.args b/tests/nwfilterxml2firewalldata/all-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/all-linux.args
rename to tests/nwfilterxml2firewalldata/all-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/arp-linux.args b/tests/nwfilterxml2firewalldata/arp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/arp-linux.args
rename to tests/nwfilterxml2firewalldata/arp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/comment-linux.args
rename to tests/nwfilterxml2firewalldata/comment-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/conntrack-linux.args b/tests/nwfilterxml2firewalldata/conntrack-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/conntrack-linux.args
rename to tests/nwfilterxml2firewalldata/conntrack-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/esp-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/esp-linux.args b/tests/nwfilterxml2firewalldata/esp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/esp-linux.args
rename to tests/nwfilterxml2firewalldata/esp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/example-1-linux.args b/tests/nwfilterxml2firewalldata/example-1-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/example-1-linux.args
rename to tests/nwfilterxml2firewalldata/example-1-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/example-2-linux.args b/tests/nwfilterxml2firewalldata/example-2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/example-2-linux.args
rename to tests/nwfilterxml2firewalldata/example-2-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/hex-data-linux.args
rename to tests/nwfilterxml2firewalldata/hex-data-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/icmp-direction-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/icmp-direction2-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction2-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction2-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/icmp-direction3-linux.args b/tests/nwfilterxml2firewalldata/icmp-direction3-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-direction3-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-direction3-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/icmp-linux.args b/tests/nwfilterxml2firewalldata/icmp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmp-linux.args
rename to tests/nwfilterxml2firewalldata/icmp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfilterxml2firewalldata/icmpv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/icmpv6-linux.args
rename to tests/nwfilterxml2firewalldata/icmpv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/igmp-linux.args b/tests/nwfilterxml2firewalldata/igmp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/igmp-linux.args
rename to tests/nwfilterxml2firewalldata/igmp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/ip-linux.args b/tests/nwfilterxml2firewalldata/ip-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ip-linux.args
rename to tests/nwfilterxml2firewalldata/ip-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/ipset-linux.args b/tests/nwfilterxml2firewalldata/ipset-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipset-linux.args
rename to tests/nwfilterxml2firewalldata/ipset-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args b/tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.args
rename to tests/nwfilterxml2firewalldata/ipt-no-macspoof-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/iter1-linux.args b/tests/nwfilterxml2firewalldata/iter1-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter1-linux.args
rename to tests/nwfilterxml2firewalldata/iter1-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/iter2-linux.args b/tests/nwfilterxml2firewalldata/iter2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter2-linux.args
rename to tests/nwfilterxml2firewalldata/iter2-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/iter3-linux.args b/tests/nwfilterxml2firewalldata/iter3-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/iter3-linux.args
rename to tests/nwfilterxml2firewalldata/iter3-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/mac-linux.args b/tests/nwfilterxml2firewalldata/mac-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/mac-linux.args
rename to tests/nwfilterxml2firewalldata/mac-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/rarp-linux.args b/tests/nwfilterxml2firewalldata/rarp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/rarp-linux.args
rename to tests/nwfilterxml2firewalldata/rarp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/sctp-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/sctp-linux.args b/tests/nwfilterxml2firewalldata/sctp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/sctp-linux.args
rename to tests/nwfilterxml2firewalldata/sctp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/stp-linux.args b/tests/nwfilterxml2firewalldata/stp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/stp-linux.args
rename to tests/nwfilterxml2firewalldata/stp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/target-linux.args b/tests/nwfilterxml2firewalldata/target-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/target-linux.args
rename to tests/nwfilterxml2firewalldata/target-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/target2-linux.args b/tests/nwfilterxml2firewalldata/target2-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/target2-linux.args
rename to tests/nwfilterxml2firewalldata/target2-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/tcp-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/tcp-linux.args b/tests/nwfilterxml2firewalldata/tcp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/tcp-linux.args
rename to tests/nwfilterxml2firewalldata/tcp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/udp-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/udp-linux.args b/tests/nwfilterxml2firewalldata/udp-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udp-linux.args
rename to tests/nwfilterxml2firewalldata/udp-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
rename to tests/nwfilterxml2firewalldata/udplite-ipv6-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/udplite-linux.args b/tests/nwfilterxml2firewalldata/udplite-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/udplite-linux.args
rename to tests/nwfilterxml2firewalldata/udplite-linux.ebiptables.args
diff --git a/tests/nwfilterxml2firewalldata/vlan-linux.args b/tests/nwfilterxml2firewalldata/vlan-linux.ebiptables.args
similarity index 100%
rename from tests/nwfilterxml2firewalldata/vlan-linux.args
rename to tests/nwfilterxml2firewalldata/vlan-linux.ebiptables.args
-- 
2.43.0