8:59 p.m.
---
src/qemu/qemu_driver.c | 2 +-
tests/Makefile.am | 10 +++++-----
tests/cputest.c | 16 ++++++++--------
tests/libxlxml2domconfigtest.c | 4 ++--
tests/qemuagenttest.c | 2 +-
tests/qemucapabilitiestest.c | 2 +-
tests/qemucaps2xmltest.c | 2 +-
tests/qemucommandutiltest.c | 2 +-
tests/qemuhotplugtest.c | 2 +-
tests/qemumigparamstest.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
tests/virmocklibxl.c | 4 ++--
tests/virnetdaemontest.c | 2 +-
tests/virstoragetest.c | 4 ++--
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b03eb3042d..da23b7be2c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2112,7 +2112,7 @@ qemuDomainReboot(virDomainPtr dom, unsigned int flags)
*/
if ((!useAgent) ||
(ret < 0 && (acpiRequested || !flags))) {
-#if !WITH_YAJL
+#if !WITH_JANSSON
virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("ACPI reboot is not supported without the JSON
monitor"));
goto endjob;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ddff0bbcea..4092f99713 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -331,9 +331,9 @@ if WITH_CIL
test_programs += objectlocking
endif WITH_CIL
-if WITH_YAJL
+if WITH_JANSSON
test_programs += virjsontest
-endif WITH_YAJL
+endif WITH_JANSSON
test_programs += \
networkxml2xmltest \
@@ -1227,15 +1227,15 @@ virdeterministichashmock_la_LIBADD = $(MOCKLIBS_LIBS)
test_libraries += virdeterministichashmock.la
-if WITH_YAJL
+if WITH_JANSSON
virmacmaptest_SOURCES = \
virmacmaptest.c testutils.h testutils.c
virmacmaptest_LDADD = $(LDADDS)
test_programs += virmacmaptest
-else ! WITH_YAJL
+else ! WITH_JANSSON
EXTRA_DIST += virmacmaptest.c
-endif ! WITH_YAJL
+endif ! WITH_JANSSON
virnetdevtest_SOURCES = \
virnetdevtest.c testutils.h testutils.c
diff --git a/tests/cputest.c b/tests/cputest.c
index e86cd0b9bc..83c9cb0a35 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -40,7 +40,7 @@
#include "cpu/cpu_map.h"
#include "virstring.h"
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
# include "testutilsqemu.h"
# include "qemumonitortestutils.h"
# define __QEMU_CAPSPRIV_H_ALLOW__
@@ -67,7 +67,7 @@ struct data {
int result;
};
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
static virQEMUDriver driver;
#endif
@@ -479,7 +479,7 @@ typedef enum {
JSON_MODELS_REQUIRED,
} cpuTestCPUIDJson;
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
static virQEMUCapsPtr
cpuTestMakeQEMUCaps(const struct data *data)
{
@@ -554,7 +554,7 @@ cpuTestGetCPUModels(const struct data *data,
return 0;
}
-#else /* if WITH_QEMU && WITH_YAJL */
+#else /* if WITH_QEMU && WITH_JANSSON */
static int
cpuTestGetCPUModels(const struct data *data,
@@ -834,7 +834,7 @@ cpuTestUpdateLive(const void *arg)
}
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
static int
cpuTestJSONCPUID(const void *arg)
{
@@ -911,7 +911,7 @@ mymain(void)
virDomainCapsCPUModelsPtr ppc_models = NULL;
int ret = 0;
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
if (qemuTestDriverInit(&driver) < 0)
return EXIT_FAILURE;
@@ -1004,7 +1004,7 @@ mymain(void)
host "/" cpu " (" #models ")", \
host, cpu, models, 0, result)
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
# define DO_TEST_JSON(arch, host, json) \
do { \
if (json == JSON_MODELS) { \
@@ -1205,7 +1205,7 @@ mymain(void)
DO_TEST_CPUID(VIR_ARCH_X86_64, "Xeon-X5460", JSON_NONE);
cleanup:
-#if WITH_QEMU && WITH_YAJL
+#if WITH_QEMU && WITH_JANSSON
qemuTestDriverFree(&driver);
#endif
diff --git a/tests/libxlxml2domconfigtest.c b/tests/libxlxml2domconfigtest.c
index 0d2a7385e5..5105874cdc 100644
--- a/tests/libxlxml2domconfigtest.c
+++ b/tests/libxlxml2domconfigtest.c
@@ -33,7 +33,7 @@
#include "testutils.h"
-#if defined(WITH_LIBXL) && defined(WITH_YAJL) &&
defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON)
+#if defined(WITH_LIBXL) && defined(WITH_JANSSON) &&
defined(HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON)
# include "internal.h"
# include "viralloc.h"
@@ -225,4 +225,4 @@ int main(void)
return EXIT_AM_SKIP;
}
-#endif /* WITH_LIBXL && WITH_YAJL && HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON
*/
+#endif /* WITH_LIBXL && WITH_JANSSON &&
HAVE_LIBXL_DOMAIN_CONFIG_FROM_JSON */
diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c
index 2f79986207..232b34f9cd 100644
--- a/tests/qemuagenttest.c
+++ b/tests/qemuagenttest.c
@@ -907,7 +907,7 @@ mymain(void)
{
int ret = 0;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c
index 5a42a35c11..ff7610ffb3 100644
--- a/tests/qemucapabilitiestest.c
+++ b/tests/qemucapabilitiestest.c
@@ -139,7 +139,7 @@ mymain(void)
virQEMUDriver driver;
testQemuData data;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index 5b9152b04d..e3b7b97925 100644
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -165,7 +165,7 @@ mymain(void)
testQemuData data;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
index f0921e3b93..8e57a1b79d 100644
--- a/tests/qemucommandutiltest.c
+++ b/tests/qemucommandutiltest.c
@@ -76,7 +76,7 @@ mymain(void)
int ret = 0;
testQemuCommandBuildObjectFromJSONData data1;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index dc0d2cf284..ddd3ae40c1 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -588,7 +588,7 @@ mymain(void)
struct qemuHotplugTestData data = {0};
struct testQemuHotplugCpuParams cpudata;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemumigparamstest.c b/tests/qemumigparamstest.c
index 0532053722..b8af68211b 100644
--- a/tests/qemumigparamstest.c
+++ b/tests/qemumigparamstest.c
@@ -203,7 +203,7 @@ mymain(void)
virQEMUDriver driver;
int ret = 0;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index edd57067bd..1e427c8bb0 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2864,7 +2864,7 @@ mymain(void)
struct testQAPISchemaData qapiData;
char *metaschema = NULL;
-#if !WITH_YAJL
+#if !WITH_JANSSON
fputs("libvirt not compiled with JSON support, skipping this test\n",
stderr);
return EXIT_AM_SKIP;
#endif
diff --git a/tests/virmocklibxl.c b/tests/virmocklibxl.c
index 546c6d6a43..0a047c239f 100644
--- a/tests/virmocklibxl.c
+++ b/tests/virmocklibxl.c
@@ -22,7 +22,7 @@
#include <config.h>
-#if defined(WITH_LIBXL) && defined(WITH_YAJL)
+#if defined(WITH_LIBXL) && defined(WITH_JANSSON)
# include "virmock.h"
# include <sys/stat.h>
# include <unistd.h>
@@ -136,4 +136,4 @@ VIR_MOCK_IMPL_RET_ARGS(stat, int,
return real_stat(path, sb);
}
-#endif /* WITH_LIBXL && WITH_YAJL */
+#endif /* WITH_LIBXL && WITH_JANSSON */
diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c
index ef869b16e3..7167147b8b 100644
--- a/tests/virnetdaemontest.c
+++ b/tests/virnetdaemontest.c
@@ -26,7 +26,7 @@
#define VIR_FROM_THIS VIR_FROM_RPC
-#if defined(HAVE_SOCKETPAIR) && defined(WITH_YAJL)
+#if defined(HAVE_SOCKETPAIR) && defined(WITH_JANSSON)
struct testClientPriv {
int magic;
};
diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index 0e11602e84..3092134edd 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -1364,7 +1364,7 @@ mymain(void)
" <host name='example.org'
port='6000'/>\n"
"</source>\n");
-#ifdef WITH_YAJL
+#ifdef WITH_JANSSON
TEST_BACKING_PARSE("json:", NULL);
TEST_BACKING_PARSE("json:asdgsdfg", NULL);
TEST_BACKING_PARSE("json:{}", NULL);
@@ -1628,7 +1628,7 @@ mymain(void)
"<source protocol='vxhs'
name='c6718f6b-0401-441d-a8c3-1f0064d75ee0'>\n"
" <host name='example.com'
port='9999'/>\n"
"</source>\n");
-#endif /* WITH_YAJL */
+#endif /* WITH_JANSSON */
cleanup:
/* Final cleanup */
--
2.16.1