[libvirt] [PATCH 4/2] build: avoid test failure when sasl was not compiled in

Eric Blake eblake at redhat.com
Wed Sep 5 21:09:55 UTC 2012


On systems without cyrus-sasl-devel available (I happened to be
in that situation on my FreeBSD testing), this test fails rather
miserably:

TEST: libvirtdconftest
      .....!!!!!!...!!!!!!!!!!!!!!!!!!!!!!!!!  39  FAIL
FAIL: libvirtdconftest

with verbose output showing things like:

39) Test corruption                                          ... libvir: Config File error : unsupporeted configuration: remoteReadConfigFile: /usr/home/dummy/libvirt/tests/../daemon/libvirtd.conf: auth_tcp: unsupported auth sasl

* tests/libvirtdconftest.c (testCorrupt): Avoid failure when sasl
is missing.
---

Another build-breaker push.

 tests/libvirtdconftest.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c
index b394d54..a6e1f35 100644
--- a/tests/libvirtdconftest.c
+++ b/tests/libvirtdconftest.c
@@ -120,6 +120,13 @@ testCorrupt(const void *opaque)
         goto cleanup;
     }

+#if !HAVE_SASL
+    if (strstr(err->message, "unsupported auth sasl")) {
+        VIR_DEBUG("sasl unsupported, skipping this config");
+        goto cleanup;
+    }
+#endif
+
     switch (type) {
     case VIR_CONF_LONG:
         if (!strstr(err->message, "invalid type: got string; expected long")) {
-- 
1.7.11.4




More information about the libvir-list mailing list