[libvirt] [PATCH] tests/networkxml2conf: Fix to work again on non-Linux

Since commit 478ddedc12b7 the name of the loopback interface in the generated dnsmasq configuration is OS-dependent. However, the test suite has not been updated to cope with the change, causing it to fail on FreeBSD and other non-Linux operating systems. Modify the networkxml2conf test case to read the expected output from different files based on the OS we're building on. --- .../{dhcp6-nat-network.conf => dhcp6-nat-network-linux.conf} | 0 .../{dhcp6-nat-network.conf => dhcp6-nat-network-other.conf} | 2 +- .../{dhcp6-network.conf => dhcp6-network-linux.conf} | 0 .../{dhcp6-network.conf => dhcp6-network-other.conf} | 2 +- ...t-routed-network.conf => dhcp6host-routed-network-linux.conf} | 0 ...t-routed-network.conf => dhcp6host-routed-network-other.conf} | 2 +- .../{isolated-network.conf => isolated-network-linux.conf} | 0 .../{isolated-network.conf => isolated-network-other.conf} | 2 +- ...rward-plain.conf => nat-network-dns-forward-plain-linux.conf} | 0 ...rward-plain.conf => nat-network-dns-forward-plain-other.conf} | 2 +- ...dns-forwarders.conf => nat-network-dns-forwarders-linux.conf} | 0 ...dns-forwarders.conf => nat-network-dns-forwarders-other.conf} | 2 +- ...t-network-dns-hosts.conf => nat-network-dns-hosts-linux.conf} | 0 ...t-network-dns-hosts.conf => nat-network-dns-hosts-other.conf} | 2 +- ...local-domain.conf => nat-network-dns-local-domain-linux.conf} | 0 ...local-domain.conf => nat-network-dns-local-domain-other.conf} | 2 +- ...dns-srv-record.conf => nat-network-dns-srv-record-linux.conf} | 0 ...inimal.conf => nat-network-dns-srv-record-minimal-linux.conf} | 0 ...inimal.conf => nat-network-dns-srv-record-minimal-other.conf} | 2 +- ...dns-srv-record.conf => nat-network-dns-srv-record-other.conf} | 2 +- ...dns-txt-record.conf => nat-network-dns-txt-record-linux.conf} | 0 ...dns-txt-record.conf => nat-network-dns-txt-record-other.conf} | 2 +- .../{nat-network.conf => nat-network-linux.conf} | 0 ...-with-quotes.conf => nat-network-name-with-quotes-linux.conf} | 0 ...-with-quotes.conf => nat-network-name-with-quotes-other.conf} | 2 +- .../{nat-network.conf => nat-network-other.conf} | 2 +- .../{netboot-network.conf => netboot-network-linux.conf} | 0 .../{netboot-network.conf => netboot-network-other.conf} | 2 +- ...tboot-proxy-network.conf => netboot-proxy-network-linux.conf} | 0 ...tboot-proxy-network.conf => netboot-proxy-network-other.conf} | 2 +- .../{open-network.conf => open-network-linux.conf} | 0 .../{open-network.conf => open-network-other.conf} | 2 +- .../{ptr-domains-auto.conf => ptr-domains-auto-linux.conf} | 0 .../{ptr-domains-auto.conf => ptr-domains-auto-other.conf} | 2 +- .../{routed-network.conf => routed-network-linux.conf} | 0 ...uted-network-no-dns.conf => routed-network-no-dns-linux.conf} | 0 ...uted-network-no-dns.conf => routed-network-no-dns-other.conf} | 2 +- .../{routed-network.conf => routed-network-other.conf} | 2 +- tests/networkxml2conftest.c | 9 +++++++-- 39 files changed, 26 insertions(+), 21 deletions(-) copy tests/networkxml2confdata/{dhcp6-nat-network.conf => dhcp6-nat-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6-nat-network.conf => dhcp6-nat-network-other.conf} (96%) copy tests/networkxml2confdata/{dhcp6-network.conf => dhcp6-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6-network.conf => dhcp6-network-other.conf} (96%) copy tests/networkxml2confdata/{dhcp6host-routed-network.conf => dhcp6host-routed-network-linux.conf} (100%) rename tests/networkxml2confdata/{dhcp6host-routed-network.conf => dhcp6host-routed-network-other.conf} (96%) copy tests/networkxml2confdata/{isolated-network.conf => isolated-network-linux.conf} (100%) rename tests/networkxml2confdata/{isolated-network.conf => isolated-network-other.conf} (96%) copy tests/networkxml2confdata/{nat-network-dns-forward-plain.conf => nat-network-dns-forward-plain-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-forward-plain.conf => nat-network-dns-forward-plain-other.conf} (94%) copy tests/networkxml2confdata/{nat-network-dns-forwarders.conf => nat-network-dns-forwarders-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-forwarders.conf => nat-network-dns-forwarders-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-hosts.conf => nat-network-dns-hosts-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-hosts.conf => nat-network-dns-hosts-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-local-domain.conf => nat-network-dns-local-domain-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-local-domain.conf => nat-network-dns-local-domain-other.conf} (95%) copy tests/networkxml2confdata/{nat-network-dns-srv-record.conf => nat-network-dns-srv-record-linux.conf} (100%) copy tests/networkxml2confdata/{nat-network-dns-srv-record-minimal.conf => nat-network-dns-srv-record-minimal-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-srv-record-minimal.conf => nat-network-dns-srv-record-minimal-other.conf} (97%) rename tests/networkxml2confdata/{nat-network-dns-srv-record.conf => nat-network-dns-srv-record-other.conf} (97%) copy tests/networkxml2confdata/{nat-network-dns-txt-record.conf => nat-network-dns-txt-record-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-dns-txt-record.conf => nat-network-dns-txt-record-other.conf} (96%) copy tests/networkxml2confdata/{nat-network.conf => nat-network-linux.conf} (100%) copy tests/networkxml2confdata/{nat-network-name-with-quotes.conf => nat-network-name-with-quotes-linux.conf} (100%) rename tests/networkxml2confdata/{nat-network-name-with-quotes.conf => nat-network-name-with-quotes-other.conf} (97%) rename tests/networkxml2confdata/{nat-network.conf => nat-network-other.conf} (96%) copy tests/networkxml2confdata/{netboot-network.conf => netboot-network-linux.conf} (100%) rename tests/networkxml2confdata/{netboot-network.conf => netboot-network-other.conf} (96%) copy tests/networkxml2confdata/{netboot-proxy-network.conf => netboot-proxy-network-linux.conf} (100%) rename tests/networkxml2confdata/{netboot-proxy-network.conf => netboot-proxy-network-other.conf} (96%) copy tests/networkxml2confdata/{open-network.conf => open-network-linux.conf} (100%) rename tests/networkxml2confdata/{open-network.conf => open-network-other.conf} (94%) copy tests/networkxml2confdata/{ptr-domains-auto.conf => ptr-domains-auto-linux.conf} (100%) rename tests/networkxml2confdata/{ptr-domains-auto.conf => ptr-domains-auto-other.conf} (97%) copy tests/networkxml2confdata/{routed-network.conf => routed-network-linux.conf} (100%) copy tests/networkxml2confdata/{routed-network-no-dns.conf => routed-network-no-dns-linux.conf} (100%) rename tests/networkxml2confdata/{routed-network-no-dns.conf => routed-network-no-dns-other.conf} (93%) rename tests/networkxml2confdata/{routed-network.conf => routed-network-other.conf} (94%) diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6-nat-network.conf copy to tests/networkxml2confdata/dhcp6-nat-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6-nat-network.conf b/tests/networkxml2confdata/dhcp6-nat-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6-nat-network.conf rename to tests/networkxml2confdata/dhcp6-nat-network-other.conf index d1058df..f182691 100644 --- a/tests/networkxml2confdata/dhcp6-nat-network.conf +++ b/tests/networkxml2confdata/dhcp6-nat-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6-network.conf copy to tests/networkxml2confdata/dhcp6-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6-network.conf b/tests/networkxml2confdata/dhcp6-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6-network.conf rename to tests/networkxml2confdata/dhcp6-network-other.conf index 8270690..6093037 100644 --- a/tests/networkxml2confdata/dhcp6-network.conf +++ b/tests/networkxml2confdata/dhcp6-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=mynet expand-hosts -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=2001:db8:ac10:fd01::1:10,2001:db8:ac10:fd01::1:ff,64 diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/dhcp6host-routed-network.conf copy to tests/networkxml2confdata/dhcp6host-routed-network-linux.conf diff --git a/tests/networkxml2confdata/dhcp6host-routed-network.conf b/tests/networkxml2confdata/dhcp6host-routed-network-other.conf similarity index 96% rename from tests/networkxml2confdata/dhcp6host-routed-network.conf rename to tests/networkxml2confdata/dhcp6host-routed-network-other.conf index 87a1498..2d1513a 100644 --- a/tests/networkxml2confdata/dhcp6host-routed-network.conf +++ b/tests/networkxml2confdata/dhcp6host-routed-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 dhcp-range=192.168.122.1,static diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/isolated-network.conf copy to tests/networkxml2confdata/isolated-network-linux.conf diff --git a/tests/networkxml2confdata/isolated-network.conf b/tests/networkxml2confdata/isolated-network-other.conf similarity index 96% rename from tests/networkxml2confdata/isolated-network.conf rename to tests/networkxml2confdata/isolated-network-other.conf index ce4a59f..952e0d6 100644 --- a/tests/networkxml2confdata/isolated-network.conf +++ b/tests/networkxml2confdata/isolated-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.152.1 dhcp-option=3 diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-forward-plain.conf copy to tests/networkxml2confdata/nat-network-dns-forward-plain-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf b/tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf similarity index 94% rename from tests/networkxml2confdata/nat-network-dns-forward-plain.conf rename to tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf index 9a000b8..e141afc 100644 --- a/tests/networkxml2confdata/nat-network-dns-forward-plain.conf +++ b/tests/networkxml2confdata/nat-network-dns-forward-plain-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-forwarders.conf copy to tests/networkxml2confdata/nat-network-dns-forwarders-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-forwarders.conf b/tests/networkxml2confdata/nat-network-dns-forwarders-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-forwarders.conf rename to tests/networkxml2confdata/nat-network-dns-forwarders-other.conf index 0bd76bf..926fbe3 100644 --- a/tests/networkxml2confdata/nat-network-dns-forwarders.conf +++ b/tests/networkxml2confdata/nat-network-dns-forwarders-other.conf @@ -10,7 +10,7 @@ server=8.8.8.8 server=8.8.4.4 server=/example.com/192.168.1.1 server=/www.example.com/# -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-hosts.conf copy to tests/networkxml2confdata/nat-network-dns-hosts-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-hosts.conf b/tests/networkxml2confdata/nat-network-dns-hosts-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-hosts.conf rename to tests/networkxml2confdata/nat-network-dns-hosts-other.conf index 021316f..cd51d0a 100644 --- a/tests/networkxml2confdata/nat-network-dns-hosts.conf +++ b/tests/networkxml2confdata/nat-network-dns-hosts-other.conf @@ -9,7 +9,7 @@ domain=example.com expand-hosts domain-needed local=// -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-local-domain.conf copy to tests/networkxml2confdata/nat-network-dns-local-domain-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain-other.conf similarity index 95% rename from tests/networkxml2confdata/nat-network-dns-local-domain.conf rename to tests/networkxml2confdata/nat-network-dns-local-domain-other.conf index 5f41b91..bb72019 100644 --- a/tests/networkxml2confdata/nat-network-dns-local-domain.conf +++ b/tests/networkxml2confdata/nat-network-dns-local-domain-other.conf @@ -8,7 +8,7 @@ strict-order local=/example.com/ domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-srv-record.conf copy to tests/networkxml2confdata/nat-network-dns-srv-record-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf copy to tests/networkxml2confdata/nat-network-dns-srv-record-minimal-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf rename to tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf index f35ea1d..fe1a804 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record-minimal.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-minimal-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network-dns-srv-record.conf b/tests/networkxml2confdata/nat-network-dns-srv-record-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-dns-srv-record.conf rename to tests/networkxml2confdata/nat-network-dns-srv-record-other.conf index af1ed70..bdf33dc 100644 --- a/tests/networkxml2confdata/nat-network-dns-srv-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-srv-record-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 srv-host=_name._tcp.test-domain-name.com,test.example.com,1111,11,111 diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-dns-txt-record.conf copy to tests/networkxml2confdata/nat-network-dns-txt-record-linux.conf diff --git a/tests/networkxml2confdata/nat-network-dns-txt-record.conf b/tests/networkxml2confdata/nat-network-dns-txt-record-other.conf similarity index 96% rename from tests/networkxml2confdata/nat-network-dns-txt-record.conf rename to tests/networkxml2confdata/nat-network-dns-txt-record-other.conf index 7f560fb..8f127c2 100644 --- a/tests/networkxml2confdata/nat-network-dns-txt-record.conf +++ b/tests/networkxml2confdata/nat-network-dns-txt-record-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 txt-record=example,example value diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network.conf copy to tests/networkxml2confdata/nat-network-linux.conf diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes-linux.conf similarity index 100% copy from tests/networkxml2confdata/nat-network-name-with-quotes.conf copy to tests/networkxml2confdata/nat-network-name-with-quotes-linux.conf diff --git a/tests/networkxml2confdata/nat-network-name-with-quotes.conf b/tests/networkxml2confdata/nat-network-name-with-quotes-other.conf similarity index 97% rename from tests/networkxml2confdata/nat-network-name-with-quotes.conf rename to tests/networkxml2confdata/nat-network-name-with-quotes-other.conf index 36e11d1..70dea13 100644 --- a/tests/networkxml2confdata/nat-network-name-with-quotes.conf +++ b/tests/networkxml2confdata/nat-network-name-with-quotes-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 listen-address=192.168.123.1 diff --git a/tests/networkxml2confdata/nat-network.conf b/tests/networkxml2confdata/nat-network-other.conf similarity index 96% rename from tests/networkxml2confdata/nat-network.conf rename to tests/networkxml2confdata/nat-network-other.conf index a3c8b10..6fef02f 100644 --- a/tests/networkxml2confdata/nat-network.conf +++ b/tests/networkxml2confdata/nat-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/netboot-network.conf copy to tests/networkxml2confdata/netboot-network-linux.conf diff --git a/tests/networkxml2confdata/netboot-network.conf b/tests/networkxml2confdata/netboot-network-other.conf similarity index 96% rename from tests/networkxml2confdata/netboot-network.conf rename to tests/networkxml2confdata/netboot-network-other.conf index b554a54..a78f3e6 100644 --- a/tests/networkxml2confdata/netboot-network.conf +++ b/tests/networkxml2confdata/netboot-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/netboot-proxy-network.conf copy to tests/networkxml2confdata/netboot-proxy-network-linux.conf diff --git a/tests/networkxml2confdata/netboot-proxy-network.conf b/tests/networkxml2confdata/netboot-proxy-network-other.conf similarity index 96% rename from tests/networkxml2confdata/netboot-proxy-network.conf rename to tests/networkxml2confdata/netboot-proxy-network-other.conf index afb4033..cf2bec5 100644 --- a/tests/networkxml2confdata/netboot-proxy-network.conf +++ b/tests/networkxml2confdata/netboot-proxy-network-other.conf @@ -7,7 +7,7 @@ strict-order domain=example.com expand-hosts -except-interface=lo +except-interface=lo0 bind-interfaces listen-address=192.168.122.1 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml2confdata/open-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/open-network.conf copy to tests/networkxml2confdata/open-network-linux.conf diff --git a/tests/networkxml2confdata/open-network.conf b/tests/networkxml2confdata/open-network-other.conf similarity index 94% rename from tests/networkxml2confdata/open-network.conf rename to tests/networkxml2confdata/open-network-other.conf index ff09984..6e03486 100644 --- a/tests/networkxml2confdata/open-network.conf +++ b/tests/networkxml2confdata/open-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/open.addnhosts diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networkxml2confdata/ptr-domains-auto-linux.conf similarity index 100% copy from tests/networkxml2confdata/ptr-domains-auto.conf copy to tests/networkxml2confdata/ptr-domains-auto-linux.conf diff --git a/tests/networkxml2confdata/ptr-domains-auto.conf b/tests/networkxml2confdata/ptr-domains-auto-other.conf similarity index 97% rename from tests/networkxml2confdata/ptr-domains-auto.conf rename to tests/networkxml2confdata/ptr-domains-auto-other.conf index 7f1a393..7f2cd8b 100644 --- a/tests/networkxml2confdata/ptr-domains-auto.conf +++ b/tests/networkxml2confdata/ptr-domains-auto-other.conf @@ -7,7 +7,7 @@ strict-order local=/122.168.192.in-addr.arpa/ local=/1.0.e.f.0.1.c.a.8.b.d.0.1.0.0.2.ip6.arpa/ -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr0 dhcp-range=192.168.122.2,192.168.122.254 diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network-linux.conf similarity index 100% copy from tests/networkxml2confdata/routed-network.conf copy to tests/networkxml2confdata/routed-network-linux.conf diff --git a/tests/networkxml2confdata/routed-network-no-dns.conf b/tests/networkxml2confdata/routed-network-no-dns-linux.conf similarity index 100% copy from tests/networkxml2confdata/routed-network-no-dns.conf copy to tests/networkxml2confdata/routed-network-no-dns-linux.conf diff --git a/tests/networkxml2confdata/routed-network-no-dns.conf b/tests/networkxml2confdata/routed-network-no-dns-other.conf similarity index 93% rename from tests/networkxml2confdata/routed-network-no-dns.conf rename to tests/networkxml2confdata/routed-network-no-dns-other.conf index 83cc85e..eada11e 100644 --- a/tests/networkxml2confdata/routed-network-no-dns.conf +++ b/tests/networkxml2confdata/routed-network-no-dns-other.conf @@ -6,6 +6,6 @@ ## dnsmasq conf file created by libvirt strict-order port=0 -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 diff --git a/tests/networkxml2confdata/routed-network.conf b/tests/networkxml2confdata/routed-network-other.conf similarity index 94% rename from tests/networkxml2confdata/routed-network.conf rename to tests/networkxml2confdata/routed-network-other.conf index 970aa3c..79f1d77 100644 --- a/tests/networkxml2confdata/routed-network.conf +++ b/tests/networkxml2confdata/routed-network-other.conf @@ -5,7 +5,7 @@ ## ## dnsmasq conf file created by libvirt strict-order -except-interface=lo +except-interface=lo0 bind-dynamic interface=virbr1 addn-hosts=/var/lib/libvirt/dnsmasq/local.addnhosts diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index a80d3b2..617c7ea 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -71,11 +71,16 @@ testCompareXMLToConfHelper(const void *data) const testInfo *info = data; char *inxml = NULL; char *outxml = NULL; +#ifdef __linux__ + const char *os = "linux"; +#else + const char *os = "other"; +#endif if (virAsprintf(&inxml, "%s/networkxml2confdata/%s.xml", abs_srcdir, info->name) < 0 || - virAsprintf(&outxml, "%s/networkxml2confdata/%s.conf", - abs_srcdir, info->name) < 0) { + virAsprintf(&outxml, "%s/networkxml2confdata/%s-%s.conf", + abs_srcdir, info->name, os) < 0) { goto cleanup; } -- 2.7.4