test: drop bogus check for YAJL from libxl test/mock

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

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/tests/libxlmock.c b/tests/libxlmock.c
index f564a0ef729839d15b247edbce5753419ff89b3d..8b697702b5725fba21ba5e6633eed5119066d13c 100644 (file)
--- 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 641834156493da5beaf34a6f895499b2a4ef36f5..21c4e7d149a7e8459d8200d7cd745d217e3c8eca 100644 (file)
--- 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 */