build: properly skip tests

I got this failure on FreeBSD:

shunloadtest.c: In function 'main':
shunloadtest.c:150: error: 'EXIT_AM_SKIP' undeclared (first use in this function)

but inspection showed several other problems, all fixed here.

* tests/domainsnapshotxml2xmltest.c [!WITH_QEMU]: Ensure
EXIT_AM_SKIP is defined.
* tests/esxutilstest.c [!WITH_ESX]: Likewise.
* tests/openvzutilstest.c [!WITH_OPENVZ]: Likewise.
* tests/qemuargv2xmltest.c [!WITH_QEMU]: Likewise.
* tests/qemuhelptest.c [!WITH_QEMU]: Likewise.
* tests/qemuxml2argvtest.c [!WITH_QEMU]: Likewise.
* tests/qemuxml2xmltest.c [!WITH_QEMU]: Likewise.
* tests/qemuxmlnstest.c [!WITH_QEMU]: Likewise.
* tests/shunloadtest.c [!linux]: Likewise.
* tests/vmx2xmltest.c [!WITH_VMX]: Likewise.
* tests/xml2vmxtest.c [!WITH_VMX]: Likewise.

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index c2266f4eb19b447fcda9fe8b7fa22b0e4c633e8e..90ff9bb372dafe2505b9054caa9cc2a6bbed0e34 100644 (file)
--- a/tests/domainsnapshotxml2xmltest.c
+++ b/tests/domainsnapshotxml2xmltest.c
@@ -118,6 +118,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c
index 8241ecd73f9a9bf45dcbea9003599e57fe8f6d0f..201b930edc01a96e65a09e961018c028aca03756 100644 (file)
--- a/tests/esxutilstest.c
+++ b/tests/esxutilstest.c
@@ -279,6 +279,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c
index f04ddbbce34a5cd1da7724f04849de2548cc18f5..7f5ddc9bc6471891f0790582f8746168323688b7 100644 (file)
--- a/tests/openvzutilstest.c
+++ b/tests/openvzutilstest.c
@@ -160,6 +160,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c
index a20df067d8fa7f0d047f7d73aaf60c2180191d38..cb3cafdc4e4f9ece18cac053e905b5569554dbc9 100644 (file)
--- a/tests/qemuargv2xmltest.c
+++ b/tests/qemuargv2xmltest.c
@@ -243,6 +243,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index df677cc5eedcc743d0967ebcde93f3e740955842..cc9f1ad47e13c5e5a48c81809dee8cc00d0be6ae 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -578,6 +578,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e75d55e74b57a04ac90da5805973c06a54dfd156..228d052de32044eefef27411290fefdd0c3e9a0e 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -669,6 +669,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 623e72ccacd45e3c351a7cde4ea38b957f930a36..35bfdcebc07ffe2415cb0486326b98ad222e9ff8 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -211,6 +211,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int
 main(void)

diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c
index ee3ad1b084fff496b60ef74a406547a6713f98c6..86cf9740c9cf6caae30d30e68189fa39990218d2 100644 (file)
--- a/tests/qemuxmlnstest.c
+++ b/tests/qemuxmlnstest.c
@@ -284,6 +284,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c
index ab6e56fced9a563f9b0779a2c3211b3cc6e96e51..8113ef37d9ecb01559ab67c322512068ada4dd8f 100644 (file)
--- a/tests/shunloadtest.c
+++ b/tests/shunloadtest.c
@@ -144,6 +144,7 @@ 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 5c0018a5c8fc5c8862e43a2fe89eda93fb0c849d..3c566f898624db698cd846a96c0781fe6fb849e8 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -289,6 +289,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 5530b45a8fe7c6d6cd32a136b3f1c74cb9798824..f4e4ed6b60d37eb4a917a29f5f711b85e6700b86 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -301,6 +301,7 @@ mymain(void)
 VIRT_TEST_MAIN(mymain)
 
 #else
+# include "testutils.h"
 
 int main(void)
 {