mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 05:35:25 +00:00
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>
This commit is contained in:
parent
971305e86f
commit
7817c3f89c
@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#if defined(WITH_LIBXL) && defined(WITH_YAJL)
|
#if defined(WITH_LIBXL)
|
||||||
# include "virmock.h"
|
# include "virmock.h"
|
||||||
# include <sys/stat.h>
|
# include <sys/stat.h>
|
||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
@ -168,4 +168,4 @@ libxlDomainGetEmulatorType(const virDomainDef *def G_GNUC_UNUSED)
|
|||||||
return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN;
|
return LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* WITH_LIBXL && WITH_YAJL */
|
#endif /* WITH_LIBXL */
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include "testutils.h"
|
#include "testutils.h"
|
||||||
|
|
||||||
#if defined(WITH_LIBXL) && defined(WITH_YAJL)
|
#if defined(WITH_LIBXL)
|
||||||
|
|
||||||
# include "internal.h"
|
# include "internal.h"
|
||||||
# include "libxl/libxl_conf.h"
|
# include "libxl/libxl_conf.h"
|
||||||
@ -224,4 +224,4 @@ int main(void)
|
|||||||
return EXIT_AM_SKIP;
|
return EXIT_AM_SKIP;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* WITH_LIBXL && WITH_YAJL */
|
#endif /* WITH_LIBXL */
|
||||||
|
Loading…
Reference in New Issue
Block a user