From: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Date: Fri, 22 Nov 2019 13:53:43 +0000 (+0100)
Subject: capabilities plugin: update checks in configure.ac
X-Git-Tag: collectd-5.11.0~17^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7b1a7ac7a3b733b4fa85e91c92a085f85bf002e;p=thirdparty%2Fcollectd.git

capabilities plugin: update checks in configure.ac

Update checks in configure.ac.
Small improvement in unit test.

Change-Id: I68f03a57c7779f8fe95a84c6a3a851fb1440d8b8
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
---

diff --git a/configure.ac b/configure.ac
index 9c1d0461f..78e237e6e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4591,7 +4591,7 @@ if test "x$with_libjansson" = "xyes"; then
 
   AC_CHECK_LIB([jansson], [json_loads],
     [with_libjansson="yes"],
-    [with_libjansson="no (Symbol 'json_loads' not found)"]
+    [with_libjansson="no (symbol 'json_loads' not found)"]
   )
 
   LDFLAGS="$SAVE_LDFLAGS"
diff --git a/src/capabilities_test.c b/src/capabilities_test.c
index 2d9edd42a..16061d294 100644
--- a/src/capabilities_test.c
+++ b/src/capabilities_test.c
@@ -250,7 +250,7 @@ DEF_TEST(get_dmi_variables) {
   int ret = cap_get_dmi_variables(root, 0, "TEST_TYPE");
   EXPECT_EQ_INT(0, ret);
 
-  char *test_str = json_dumps(root, JSON_COMPACT);
+  char *test_str = json_dumps(root, JSON_COMPACT | JSON_PRESERVE_ORDER);
   CHECK_NOT_NULL(test_str);
   json_decref(root);
   EXPECT_EQ_STR(RESULT_STRING_JSON, test_str);
@@ -262,7 +262,7 @@ DEF_TEST(get_dmi_variables) {
   ret = cap_get_dmi_variables(root, 1, "TEST_TYPE2");
   EXPECT_EQ_INT(-1, ret);
 
-  test_str = json_dumps(root, JSON_COMPACT);
+  test_str = json_dumps(root, JSON_COMPACT | JSON_PRESERVE_ORDER);
   CHECK_NOT_NULL(test_str);
   json_decref(root);
   EXPECT_EQ_STR("{\"TEST_TYPE2\":[]}", test_str);