From b5f8ee61a7f7e9bd291dd26b0585d03eb686c941 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 5 May 2024 13:19:16 +0200 Subject: Adding upstream version 1.46.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 deletions(-) delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/array/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-array/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/compact-object/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/ensure-ascii/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-array/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-array/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-compact-object/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/indent-object/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/object/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/preserve-order/output delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/input delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/real-precision/output delete mode 100755 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/run delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/env delete mode 100644 fluent-bit/lib/jansson-e23f558/test/suites/encoding-flags/sort-keys/input delete 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 deleted file mode 100644 index 44e2ace7e..000000000 --- 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 fd8ef0957..000000000 --- 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 4474aaf14..000000000 --- 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 44e2ace7e..000000000 --- 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 3169929f6..000000000 --- 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 93cb33dda..000000000 --- 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 062e54fb4..000000000 --- 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 73a5d70e3..000000000 --- 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 1b7b3e3f9..000000000 --- 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 69469cef5..000000000 --- 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 94fa79d2d..000000000 --- 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 d220f837c..000000000 --- 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 44e2ace7e..000000000 --- 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 c57d705ba..000000000 --- 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 78fbfcc2e..000000000 --- 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 44e2ace7e..000000000 --- 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 c57d705ba..000000000 --- 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 c73acc179..000000000 --- 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 062e54fb4..000000000 --- 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 9cc42948d..000000000 --- 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 961558ca2..000000000 --- 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 062e54fb4..000000000 --- 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 0fbddba44..000000000 --- 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 9120b0351..000000000 --- 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 062e54fb4..000000000 --- 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 ecd219f72..000000000 --- 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 4d9d20659..000000000 --- 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 27bcf18a0..000000000 --- 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 7a443f684..000000000 --- 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 9c52cbcd6..000000000 --- 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 e291165c1..000000000 --- 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 f273c73e5..000000000 --- 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 5db7d5e5c..000000000 --- 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 -# -# 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 3ef24cb7b..000000000 --- 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 66951d6b0..000000000 --- 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 132d9df31..000000000 --- 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 -- cgit v1.2.3