forked from pool/libvirt
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
|
commit 8e373e6d80afa3b212464b8b1a9faa36ee684472
|
||
|
|
Author: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Date: Mon Aug 13 13:39:25 2018 +0200
|
||
|
|
|
||
|
|
Revert "tests: also skip qemuagenttest with old jansson"
|
||
|
|
|
||
|
|
This reverts commit c31146685f5c8558ff88d52d03a68533c9220feb.
|
||
|
|
|
||
|
|
Jansson cannot parse QEMU's quirky JSON.
|
||
|
|
Revert back to yajl.
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1614569
|
||
|
|
|
||
|
|
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
|
||
|
|
Index: libvirt-4.6.0/tests/qemuagenttest.c
|
||
|
|
===================================================================
|
||
|
|
--- libvirt-4.6.0.orig/tests/qemuagenttest.c
|
||
|
|
+++ libvirt-4.6.0/tests/qemuagenttest.c
|
||
|
|
@@ -907,8 +907,8 @@ mymain(void)
|
||
|
|
{
|
||
|
|
int ret = 0;
|
||
|
|
|
||
|
|
-#if !WITH_STABLE_ORDERING_JANSSON
|
||
|
|
- fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
|
||
|
|
+#if !WITH_JANSSON
|
||
|
|
+ fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
|
||
|
|
return EXIT_AM_SKIP;
|
||
|
|
#endif
|
||
|
|
|