nwfilter: rename ebiptables unit tests and data files

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.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Dion Bosschieter <dionbosschieter@gmail.com>

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
 

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);