diff options
| author | Ján Tomko <jtomko@redhat.com> | 2018-05-02 17:17:01 +0200 |
|---|---|---|
| committer | Ján Tomko <jtomko@redhat.com> | 2018-07-18 17:54:18 +0200 |
| commit | 9cf38263d05ca7f27dbbd9b1a0b48d338d9280e2 (patch) | |
| tree | 4876a9af5fed05b6dd47495b978769252144755e /tests/qemucommandutiltest.c | |
| parent | 93fdc9e0b0cbb2eec32745a868ac4633f0912ad5 (diff) | |
| download | libvirt-9cf38263d05ca7f27dbbd9b1a0b48d338d9280e2.tar.gz | |
Switch from yajl to Jansson
Yajl has not seen much activity upstream recently.
Switch to using Jansson >= 2.5.
All the platforms we target on https://libvirt.org/platforms.html
have a version >= 2.7 listed on the sites below:
https://repology.org/metapackage/jansson/versions
https://build.opensuse.org/package/show/devel:libraries:c_c++/libjansson
Additionally, Ubuntu 14.04 on Travis-CI has 2.5. Set the requirement
to 2.5 since we don't use anything from newer versions.
Implement virJSONValue{From,To}String using Jansson, delete the yajl
code (and the related virJSONParser structure) and report an error
if someone explicitly specifies --with-yajl.
Also adjust the test data to account for Jansson's different whitespace
usage for empty arrays and tune up the specfile to keep 'make rpm'
working when bisecting.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Diffstat (limited to 'tests/qemucommandutiltest.c')
| -rw-r--r-- | tests/qemucommandutiltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |