Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

36 files changed, 0 insertions, 102 deletions

diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input
deleted file mode 100644
index 44e2ace7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output
deleted file mode 100644
index fd8ef095..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env
deleted file mode 100644
index 4474aaf1..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_COMPACT=1
-export JSON_COMPACT
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input
deleted file mode 100644
index 44e2ace7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output
deleted file mode 100644
index 3169929f..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output
+++ /dev/null
@@ -1 +0,0 @@
-[1,2]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env
deleted file mode 100644
index 93cb33dd..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env
+++ /dev/null
@@ -1,3 +0,0 @@
-JSON_COMPACT=1
-HASHSEED=1
-export JSON_COMPACT HASHSEED
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input
deleted file mode 100644
index 062e54fb..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input
+++ /dev/null
@@ -1 +0,0 @@
-{"a": 1, "b": 2}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output
deleted file mode 100644
index 73a5d70e..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output
+++ /dev/null
@@ -1 +0,0 @@
-{"a":1,"b":2}
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env
deleted file mode 100644
index 1b7b3e3f..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_ENSURE_ASCII=1
-export JSON_ENSURE_ASCII
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input
deleted file mode 100644
index 69469cef..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input
+++ /dev/null
@@ -1,8 +0,0 @@
-[
-    "foo",
-    "å ä ö",
-    "foo åä",
-    "åä foo",
-    "å foo ä",
-    "clef g: 𝄞"
-]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output
deleted file mode 100644
index 94fa79d2..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output
+++ /dev/null
@@ -1 +0,0 @@
-["foo", "\u00E5 \u00E4 \u00F6", "foo \u00E5\u00E4", "\u00E5\u00E4 foo", "\u00E5 foo \u00E4", "clef g: \uD834\uDD1E"]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env
deleted file mode 100644
index d220f837..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_INDENT=4
-export JSON_INDENT
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input
deleted file mode 100644
index 44e2ace7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output
deleted file mode 100644
index c57d705b..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    1,
-    2
-]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env
deleted file mode 100644
index 78fbfcc2..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env
+++ /dev/null
@@ -1,3 +0,0 @@
-JSON_INDENT=4
-JSON_COMPACT=1
-export JSON_INDENT JSON_COMPACT
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input
deleted file mode 100644
index 44e2ace7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input
+++ /dev/null
@@ -1 +0,0 @@
-[1, 2]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output
deleted file mode 100644
index c57d705b..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    1,
-    2
-]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env
deleted file mode 100644
index c73acc17..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env
+++ /dev/null
@@ -1,4 +0,0 @@
-JSON_INDENT=4
-JSON_COMPACT=1
-HASHSEED=1
-export JSON_INDENT JSON_COMPACT HASHSEED
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input
deleted file mode 100644
index 062e54fb..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input
+++ /dev/null
@@ -1 +0,0 @@
-{"a": 1, "b": 2}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output
deleted file mode 100644
index 9cc42948..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "a":1,
-    "b":2
-}
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env
deleted file mode 100644
index 961558ca..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env
+++ /dev/null
@@ -1,3 +0,0 @@
-JSON_INDENT=4
-HASHSEED=1
-export JSON_INDENT HASHSEED
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input
deleted file mode 100644
index 062e54fb..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input
+++ /dev/null
@@ -1 +0,0 @@
-{"a": 1, "b": 2}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output
deleted file mode 100644
index 0fbddba4..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "a": 1,
-    "b": 2
-}
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env
deleted file mode 100644
index 9120b035..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env
+++ /dev/null
@@ -1,2 +0,0 @@
-HASHSEED=1
-export HASHSEED
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input
deleted file mode 100644
index 062e54fb..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input
+++ /dev/null
@@ -1 +0,0 @@
-{"a": 1, "b": 2}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output
deleted file mode 100644
index ecd219f7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output
+++ /dev/null
@@ -1 +0,0 @@
-{"a": 1, "b": 2}
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env
deleted file mode 100644
index 4d9d2065..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_PRESERVE_ORDER=1
-export JSON_PRESERVE_ORDER
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input
deleted file mode 100644
index 27bcf18a..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input
+++ /dev/null
@@ -1 +0,0 @@
-{"foo": 1, "bar": 2, "asdf": 3, "deadbeef": 4, "badc0ffee": 5, "qwerty": 6}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output
deleted file mode 100644
index 7a443f68..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output
+++ /dev/null
@@ -1 +0,0 @@
-{"foo": 1, "bar": 2, "asdf": 3, "deadbeef": 4, "badc0ffee": 5, "qwerty": 6}
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env
deleted file mode 100644
index 9c52cbcd..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_REAL_PRECISION=4
-export JSON_REAL_PRECISION
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input
deleted file mode 100644
index e291165c..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input
+++ /dev/null
@@ -1 +0,0 @@
-[1.23456789, 1.0, 1.0000000000000002]
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output
deleted file mode 100644
index f273c73e..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output
+++ /dev/null
@@ -1 +0,0 @@
-[1.235, 1.0, 1.0]
\ No newline at end of file
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run
deleted file mode 100755
index 5db7d5e5..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2009-2016 Petri Lehtinen <petri@digip.org>
-#
-# Jansson is free software; you can redistribute it and/or modify
-# it under the terms of the MIT license. See LICENSE for details.
-
-is_test() {
-    test -d $test_path
-}
-
-run_test() {
-    (
-        if [ -f $test_path/env ]; then
-            . $test_path/env
-        fi
-        $json_process --env <$test_path/input >$test_log/stdout 2>$test_log/stderr
-    )
-    valgrind_check $test_log/stderr || return 1
-    cmp -s $test_path/output $test_log/stdout
-}
-
-show_error() {
-    valgrind_show_error && return
-
-    echo "EXPECTED OUTPUT:"
-    nl -bn $test_path/output
-    echo "ACTUAL OUTPUT:"
-    nl -bn $test_log/stdout
-}
-
-. $top_srcdir/test/scripts/run-tests.sh
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env
deleted file mode 100644
index 3ef24cb7..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env
+++ /dev/null
@@ -1,2 +0,0 @@
-JSON_SORT_KEYS=1
-export JSON_SORT_KEYS
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input
deleted file mode 100644
index 66951d6b..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input
+++ /dev/null
@@ -1 +0,0 @@
-{"foo": 1, "bar": 2, "baz": 3, "quux": 4}
diff --git a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/output b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/output
deleted file mode 100644
index 132d9df3..00000000
--- a/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/output
+++ /dev/null
@@ -1 +0,0 @@
-{"bar": 2, "baz": 3, "foo": 1, "quux": 4}
\ No newline at end of file