tests: Avoid crossdir inclusion for networkxml2* tests

Instead of including network driver header files as:

  #include "network/header.h"

pass network_inc_dir to the compiler and include files directly.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/meson.build b/tests/meson.build
index b9630477321f78868a6939641a2e09ff897681c0..4b93fb405a11fc2bdba2ea609feed51e3c5f3ee9 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -407,9 +407,9 @@ endif
 
 if conf.has('WITH_NETWORK')
   tests += [
-    { 'name': 'networkxml2conftest', 'link_with': [ network_driver_impl ] },
-    { 'name': 'networkxml2firewalltest', 'link_with': [ network_driver_impl ] },
-    { 'name': 'networkxml2xmltest', 'link_with': [ network_driver_impl ] },
+    { 'name': 'networkxml2conftest', 'include': [ network_inc_dir ], 'link_with': [ network_driver_impl ] },
+    { 'name': 'networkxml2firewalltest', 'include': [ network_inc_dir ], 'link_with': [ network_driver_impl ] },
+    { 'name': 'networkxml2xmltest', 'include': [ network_inc_dir ], 'link_with': [ network_driver_impl ],  },
   ]
 endif
 

diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c
index d18985e060b1417f02c224b22de3275ee4a9ce65..40b9d07d31ef2043b1997c09aab56865b7ced713 100644 (file)
--- a/tests/networkxml2conftest.c
+++ b/tests/networkxml2conftest.c
@@ -9,7 +9,7 @@
 #include "testutils.h"
 #include "network_conf.h"
 #include "viralloc.h"
-#include "network/bridge_driver.h"
+#include "bridge_driver.h"
 #define LIBVIRT_VIRCOMMANDPRIV_H_ALLOW
 #include "vircommandpriv.h"
 

diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltest.c
index f7b87ff79859c05360d1521a77cd04cf88823037..e32f1b281ed3bffbd29216340c84cc564d42bb04 100644 (file)
--- a/tests/networkxml2firewalltest.c
+++ b/tests/networkxml2firewalltest.c
@@ -27,7 +27,7 @@
 
 # include <gio/gio.h>
 
-# include "network/bridge_driver_platform.h"
+# include "bridge_driver_platform.h"
 # include "virbuffer.h"
 # include "virmock.h"
 

diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c
index 0783d84915a95fa7bcae38ecac9017931344ae89..59266defb670c9a9b2a9773877683e5901837c13 100644 (file)
--- a/tests/networkxml2xmltest.c
+++ b/tests/networkxml2xmltest.c
@@ -8,7 +8,7 @@
 #include "internal.h"
 #include "testutils.h"
 #include "network_conf.h"
-#include "network/bridge_driver.h"
+#include "bridge_driver.h"
 
 #define VIR_FROM_THIS VIR_FROM_NONE