The libxlmock.c conditionalizes on WITH_YAJL, but this mock is
used from other tests which only conditionalize on WITH_LIBXL.
The libxl code does not have any dependancy on YAJL, so the
bogus condition can be removed from the mock and also from
libxlxml2domconfigtest.c
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
tests/libxlmock.c | 4 ++--
tests/libxlxml2domconfigtest.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/libxlmock.c b/tests/libxlmock.c
index f564a0ef72..8b697702b5 100644
--- a/tests/libxlmock.c
+++ b/tests/libxlmock.c
@@ -20,7 +20,7 @@
#include <config.h>
-#if defined(WITH_LIBXL) && defined(WITH_YAJL)
+#if defined(WITH_LIBXL)
# include "virmock.h"
# include <sys/stat.h>
# include <unistd.h>
@@ -168,4 +168,4 @@ libxlDomainGetEmulatorType(const virDomainDef *def G_GNUC_UNUSED)
return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN;
}
-#endif /* WITH_LIBXL && WITH_YAJL */
+#endif /* WITH_LIBXL */
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 6418341564..21c4e7d149 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -28,7 +28,7 @@
#include "testutils.h"
-#if defined(WITH_LIBXL) && defined(WITH_YAJL)
+#if defined(WITH_LIBXL)
# include "internal.h"
# include "libxl/libxl_conf.h"
@@ -224,4 +224,4 @@ int main(void)
return EXIT_AM_SKIP;
}
-#endif /* WITH_LIBXL && WITH_YAJL */
+#endif /* WITH_LIBXL */
--
2.43.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
