libvirt/6f99de31-revert-jansson6.patch

commit 6f99de314855296d52cdf0badcab5b12213f2ca4
Author: Ján Tomko <jtomko@redhat.com>
Date:   Mon Aug 13 13:39:33 2018 +0200

    Revert "m4: Introduce STABLE_ORDERING_JANSSON"
    
    This reverts commit 4dd60540007042bfc0087a67f57f3e9f3311a84a.
    
    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/m4/virt-jansson.m4
===================================================================
--- libvirt-4.6.0.orig/m4/virt-jansson.m4
+++ libvirt-4.6.0/m4/virt-jansson.m4
@@ -22,9 +22,6 @@ AC_DEFUN([LIBVIRT_ARG_JANSSON],[
 AC_DEFUN([LIBVIRT_CHECK_JANSSON],[
   dnl Jansson http://www.digip.org/jansson/
   LIBVIRT_CHECK_PKG([JANSSON], [jansson], [2.5])
-  dnl Older versions of Jansson did not preserve the order of object keys
-  dnl use this check to guard the tests that are sensitive to this
-  LIBVIRT_CHECK_PKG([STABLE_ORDERING_JANSSON], [jansson], [2.8], [true])
 ])
 
 AC_DEFUN([LIBVIRT_RESULT_JANSSON],[
Index: libvirt-4.6.0/tests/qemublocktest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemublocktest.c
+++ libvirt-4.6.0/tests/qemublocktest.c
@@ -337,11 +337,6 @@ mymain(void)
     char *capslatest_x86_64 = NULL;
     virQEMUCapsPtr caps_x86_64 = NULL;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
     if (qemuTestDriverInit(&driver) < 0)
         return EXIT_FAILURE;
 
Index: libvirt-4.6.0/tests/qemucapabilitiestest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemucapabilitiestest.c
+++ libvirt-4.6.0/tests/qemucapabilitiestest.c
@@ -141,11 +141,6 @@ mymain(void)
     int ret = 0;
     testQemuData data;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #if !WITH_JANSSON
     fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
     return EXIT_AM_SKIP;
Index: libvirt-4.6.0/tests/qemucommandutiltest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemucommandutiltest.c
+++ libvirt-4.6.0/tests/qemucommandutiltest.c
@@ -76,11 +76,6 @@ mymain(void)
     int ret = 0;
     testQemuCommandBuildObjectFromJSONData data1;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #if !WITH_JANSSON
     fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
     return EXIT_AM_SKIP;
Index: libvirt-4.6.0/tests/qemuhotplugtest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemuhotplugtest.c
+++ libvirt-4.6.0/tests/qemuhotplugtest.c
@@ -593,11 +593,6 @@ mymain(void)
     struct qemuHotplugTestData data = {0};
     struct testQemuHotplugCpuParams cpudata;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #if !WITH_JANSSON
     fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
     return EXIT_AM_SKIP;
Index: libvirt-4.6.0/tests/qemumigparamstest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemumigparamstest.c
+++ libvirt-4.6.0/tests/qemumigparamstest.c
@@ -203,11 +203,6 @@ mymain(void)
     virQEMUDriver driver;
     int ret = 0;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #if !WITH_JANSSON
     fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
     return EXIT_AM_SKIP;
Index: libvirt-4.6.0/tests/qemumonitorjsontest.c
===================================================================
--- libvirt-4.6.0.orig/tests/qemumonitorjsontest.c
+++ libvirt-4.6.0/tests/qemumonitorjsontest.c
@@ -2863,11 +2863,6 @@ mymain(void)
     virJSONValuePtr metaschema = NULL;
     char *metaschemastr = NULL;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #if !WITH_JANSSON
     fputs("libvirt not compiled with JSON support, skipping this test\n", stderr);
     return EXIT_AM_SKIP;
Index: libvirt-4.6.0/tests/virjsontest.c
===================================================================
--- libvirt-4.6.0.orig/tests/virjsontest.c
+++ libvirt-4.6.0/tests/virjsontest.c
@@ -479,11 +479,6 @@ mymain(void)
 {
     int ret = 0;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #define DO_TEST_FULL(name, cmd, doc, expect, pass) \
     do { \
         struct testInfo info = { doc, expect, pass }; \
Index: libvirt-4.6.0/tests/virmacmaptest.c
===================================================================
--- libvirt-4.6.0.orig/tests/virmacmaptest.c
+++ libvirt-4.6.0/tests/virmacmaptest.c
@@ -157,11 +157,6 @@ mymain(void)
     int ret = 0;
     virMacMapPtr mgr = NULL;
 
-#if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-#endif
-
 #define DO_TEST_BASIC(f, d, ...) \
     do { \
         const char * const m[] = {__VA_ARGS__, NULL }; \
Index: libvirt-4.6.0/tests/virnetdaemontest.c
===================================================================
--- libvirt-4.6.0.orig/tests/virnetdaemontest.c
+++ libvirt-4.6.0/tests/virnetdaemontest.c
@@ -375,11 +375,6 @@ mymain(void)
     int ret = 0;
     const char *server_names[] = { "testServer0", "testServer1" };
 
-# if !WITH_STABLE_ORDERING_JANSSON
-    fputs("libvirt not compiled with recent enough Jansson, skipping this test\n", stderr);
-    return EXIT_AM_SKIP;
-# endif
-
     if (virInitialize() < 0 ||
         virEventRegisterDefaultImpl() < 0) {
         virDispatchError(NULL);