From da8061eefeb6e75c3a67b2081c57195549aa1075 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 1 Dec 2011 13:47:34 -0700
Subject: [PATCH] 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.
---
 tests/domainsnapshotxml2xmltest.c | 1 +
 tests/esxutilstest.c              | 1 +
 tests/openvzutilstest.c           | 1 +
 tests/qemuargv2xmltest.c          | 1 +
 tests/qemuhelptest.c              | 1 +
 tests/qemuxml2argvtest.c          | 1 +
 tests/qemuxml2xmltest.c           | 1 +
 tests/qemuxmlnstest.c             | 1 +
 tests/shunloadtest.c              | 1 +
 tests/vmx2xmltest.c               | 1 +
 tests/xml2vmxtest.c               | 1 +
 11 files changed, 11 insertions(+)

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index c2266f4eb1..90ff9bb372 100644
--- 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 8241ecd73f..201b930edc 100644
--- 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 f04ddbbce3..7f5ddc9bc6 100644
--- 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 a20df067d8..cb3cafdc4e 100644
--- 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 df677cc5ee..cc9f1ad47e 100644
--- 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 e75d55e74b..228d052de3 100644
--- 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 623e72ccac..35bfdcebc0 100644
--- 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 ee3ad1b084..86cf9740c9 100644
--- 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 ab6e56fced..8113ef37d9 100644
--- 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 5c0018a5c8..3c566f8986 100644
--- 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 5530b45a8f..f4e4ed6b60 100644
--- 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)
 {