From c21c3b0befeb46a51b6bf3758ffa30813bea0ff0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Mar 2024 14:19:22 +0100 Subject: Adding upstream version 1.44.3. Signed-off-by: Daniel Baumann --- .../test/suites/encoding-flags/array/input | 1 + .../test/suites/encoding-flags/array/output | 1 + .../test/suites/encoding-flags/compact-array/env | 2 ++ .../test/suites/encoding-flags/compact-array/input | 1 + .../suites/encoding-flags/compact-array/output | 1 + .../test/suites/encoding-flags/compact-object/env | 3 ++ .../suites/encoding-flags/compact-object/input | 1 + .../suites/encoding-flags/compact-object/output | 1 + .../test/suites/encoding-flags/ensure-ascii/env | 2 ++ .../test/suites/encoding-flags/ensure-ascii/input | 8 ++++++ .../test/suites/encoding-flags/ensure-ascii/output | 1 + .../test/suites/encoding-flags/indent-array/env | 2 ++ .../test/suites/encoding-flags/indent-array/input | 1 + .../test/suites/encoding-flags/indent-array/output | 4 +++ .../suites/encoding-flags/indent-compact-array/env | 3 ++ .../encoding-flags/indent-compact-array/input | 1 + .../encoding-flags/indent-compact-array/output | 4 +++ .../encoding-flags/indent-compact-object/env | 4 +++ .../encoding-flags/indent-compact-object/input | 1 + .../encoding-flags/indent-compact-object/output | 4 +++ .../test/suites/encoding-flags/indent-object/env | 3 ++ .../test/suites/encoding-flags/indent-object/input | 1 + .../suites/encoding-flags/indent-object/output | 4 +++ .../test/suites/encoding-flags/object/env | 2 ++ .../test/suites/encoding-flags/object/input | 1 + .../test/suites/encoding-flags/object/output | 1 + .../test/suites/encoding-flags/preserve-order/env | 2 ++ .../suites/encoding-flags/preserve-order/input | 1 + .../suites/encoding-flags/preserve-order/output | 1 + .../test/suites/encoding-flags/real-precision/env | 2 ++ .../suites/encoding-flags/real-precision/input | 1 + .../suites/encoding-flags/real-precision/output | 1 + .../jansson-e23f558/test/suites/encoding-flags/run | 32 ++++++++++++++++++++++ .../test/suites/encoding-flags/sort-keys/env | 2 ++ .../test/suites/encoding-flags/sort-keys/input | 1 + .../test/suites/encoding-flags/sort-keys/output | 1 + 36 files changed, 102 insertions(+) create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output create mode 100755 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input create mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/output (limited to 'fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags') 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 new file mode 100644 index 000000000..44e2ace7e --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..fd8ef0957 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..4474aaf14 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..44e2ace7e --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..3169929f6 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..93cb33dda --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..062e54fb4 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..73a5d70e3 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..1b7b3e3f9 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..69469cef5 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input @@ -0,0 +1,8 @@ +[ + "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 new file mode 100644 index 000000000..94fa79d2d --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output @@ -0,0 +1 @@ +["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 new file mode 100644 index 000000000..d220f837c --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..44e2ace7e --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..c57d705ba --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output @@ -0,0 +1,4 @@ +[ + 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 new file mode 100644 index 000000000..78fbfcc2e --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..44e2ace7e --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..c57d705ba --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output @@ -0,0 +1,4 @@ +[ + 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 new file mode 100644 index 000000000..c73acc179 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env @@ -0,0 +1,4 @@ +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 new file mode 100644 index 000000000..062e54fb4 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..9cc42948d --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output @@ -0,0 +1,4 @@ +{ + "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 new file mode 100644 index 000000000..961558ca2 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000..062e54fb4 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..0fbddba44 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output @@ -0,0 +1,4 @@ +{ + "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 new file mode 100644 index 000000000..9120b0351 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..062e54fb4 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..ecd219f72 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..4d9d20659 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..27bcf18a0 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..7a443f684 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..9c52cbcd6 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..e291165c1 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input @@ -0,0 +1 @@ +[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 new file mode 100644 index 000000000..f273c73e5 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output @@ -0,0 +1 @@ +[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 new file mode 100755 index 000000000..5db7d5e5c --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run @@ -0,0 +1,32 @@ +#!/bin/sh +# +# Copyright (c) 2009-2016 Petri Lehtinen +# +# 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 new file mode 100644 index 000000000..3ef24cb7b --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000..66951d6b0 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input @@ -0,0 +1 @@ +{"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 new file mode 100644 index 000000000..132d9df31 --- /dev/null +++ b/fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/output @@ -0,0 +1 @@ +{"bar": 2, "baz": 3, "foo": 1, "quux": 4} \ No newline at end of file -- cgit v1.2.3