cleanup: Only include testutils.h once

No reason to include it in both "if" and "else" branches.

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index 6f1c600f7430cdfae3402e8a6efe3ddce696aa0a..694c382f59a46e9446a150aff275b3f2cb914066 100644 (file)
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "testutils.h"
 # include "qemu/qemu_conf.h"
 # include "qemu/qemu_domain.h"
 # include "testutilsqemu.h"
@@ -125,7 +126,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index 55b362309cde7395854d0c29c876ee8d72d02700..e2baea2146295775944452dcf8a52552bb083388 100644 (file)
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef WITH_ESX
 
 # include <stdio.h>
@@ -8,7 +10,6 @@
 
 # include "internal.h"
 # include "viralloc.h"
-# include "testutils.h"
 # include "virutil.h"
 # include "vmx/vmx.h"
 # include "esx/esx_util.h"
@@ -279,7 +280,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/lxcxml2xmltest.c b/tests/lxcxml2xmltest.c
index e0f99f44af8f5bd7bfd7acfbf05e16079195213c..4870f4282bc26dcf21515b5e529662ae496a5798 100644 (file)
--- a/tests/lxcxml2xmltest.c
+++ b/tests/lxcxml2xmltest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_LXC
 
 # include "internal.h"
-# include "testutils.h"
 # include "lxc/lxc_conf.h"
 # include "testutilslxc.h"
 
@@ -136,7 +137,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index 9fb71787aa23392dc2aaab883e969b655d59cb29..616b6be06385c457e80fd8fe44d89b7860c5866b 100644 (file)
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef WITH_OPENVZ
 
 # include <stdio.h>
@@ -8,7 +10,6 @@
 
 # include "internal.h"
 # include "viralloc.h"
-# include "testutils.h"
 # include "virutil.h"
 # include "openvz/openvz_conf.h"
 
@@ -160,7 +161,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index 9167d88d327f9456df589656c325f7c45c3aff7b..ee6c7a9c3828be34a057a74e275f9a5820ee5e26 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "testutils.h"
 # include "qemu/qemu_command.h"
 
 # include "testutilsqemu.h"
@@ -260,7 +261,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 43774f47722380ca07b85ae87c004c55435b64ba..72901833f351e8071b0f9e146293a62eda9bf162 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -1,11 +1,12 @@
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include <stdio.h>
 # include <stdlib.h>
 
-# include "testutils.h"
 # include "qemu/qemu_capabilities.h"
 # include "viralloc.h"
 
@@ -1034,7 +1035,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemumonitortest.c b/tests/qemumonitortest.c
index 285dfa889eaf37512c44558b74526e56f923b457..a8fc57ac711e2b0e3c4e8c65c5824cd6b8c5fc89 100644 (file)
--- a/tests/qemumonitortest.c
+++ b/tests/qemumonitortest.c
@@ -5,11 +5,12 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
 # include "viralloc.h"
-# include "testutils.h"
 # include "virutil.h"
 # include "qemu/qemu_monitor.h"
 
@@ -108,7 +109,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index be6c7592a07172487f606b9b2dc42d95e60e5d24..4bf13f070acd9341a8d3fb7194270ab6923697e0 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "testutils.h"
 # include "viralloc.h"
 # include "qemu/qemu_capabilities.h"
 # include "qemu/qemu_command.h"
@@ -951,7 +952,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 3a1683f0f34a87dd62897506f51432e8bd1d0011..7434190baf9206730635c2fcd3ea337374fdb0da 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "testutils.h"
 # include "qemu/qemu_conf.h"
 # include "qemu/qemu_domain.h"
 # include "testutilsqemu.h"
@@ -285,7 +286,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c
index e6b42dca19725b5e4c43a516ca8558755e38cfa1..4e9144befc6c5b53e87106fe3911694b63236e20 100644 (file)
--- a/tests/qemuxmlnstest.c
+++ b/tests/qemuxmlnstest.c
@@ -8,10 +8,11 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
+#include "testutils.h"
+
 #ifdef WITH_QEMU
 
 # include "internal.h"
-# include "testutils.h"
 # include "qemu/qemu_capabilities.h"
 # include "qemu/qemu_command.h"
 # include "qemu/qemu_domain.h"
@@ -263,7 +264,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index eddb81877dd77809b3fbdf39c6659e5b7fb90207..8271b93647acb4c26ea8d804d46437a7a325f9b6 100644 (file)
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -40,6 +40,8 @@
 
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef linux
 
 # include <dlfcn.h>
@@ -50,7 +52,6 @@
 # include <signal.h>
 
 # include "internal.h"
-# include "testutils.h"
 
 pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
 pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
@@ -143,7 +144,6 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv)
 }
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 2d04da7500381f53c1cdd3167ecc904bfc309a6e..0003f5f4a55afbc5bf1d88466a27dd2ce4690f92 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef WITH_VMX
 
 # include <stdio.h>
@@ -8,7 +10,6 @@
 
 # include "internal.h"
 # include "viralloc.h"
-# include "testutils.h"
 # include "vmx/vmx.h"
 
 static virCapsPtr caps;
@@ -298,7 +299,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 1957659329f85eb2ff689b714b9b7c72a873e95f..fa4f6f9fd0ce56a6628e7038f5c5893aa3d6db09 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -1,5 +1,7 @@
 #include <config.h>
 
+#include "testutils.h"
+
 #ifdef WITH_VMX
 
 # include <stdio.h>
@@ -8,7 +10,6 @@
 
 # include "internal.h"
 # include "viralloc.h"
-# include "testutils.h"
 # include "vmx/vmx.h"
 
 static virCapsPtr caps;
@@ -311,7 +312,6 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
-# include "testutils.h"
 
 int main(void)
 {