[libvirt] [PATCH] build: properly skip tests

Eric Blake eblake at redhat.com
Thu Dec 1 20:49:48 UTC 2011


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.
---

Pushing under the build-breaker rule.

 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(+), 0 deletions(-)

diff --git a/tests/domainsnapshotxml2xmltest.c b/tests/domainsnapshotxml2xmltest.c
index c2266f4..90ff9bb 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 8241ecd..201b930 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 f04ddbb..7f5ddc9 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 a20df06..cb3cafd 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 df677cc..cc9f1ad 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 e75d55e..228d052 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 623e72c..35bfdce 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 ee3ad1b..86cf974 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 ab6e56f..8113ef3 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 5c0018a..3c566f8 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 5530b45..f4e4ed6 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)
 {
-- 
1.7.7.3




More information about the libvir-list mailing list