projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move to kernel style SPDX license identifiers
[babeltrace.git]
/
tests
/
cli
/
convert
/
test_auto_source_discovery_log_level
diff --git
a/tests/cli/convert/test_auto_source_discovery_log_level
b/tests/cli/convert/test_auto_source_discovery_log_level
index 459a362497c3d3df7e46f63269c20d444ecc8cf2..b7163234eb6d3bcb723f3024f4550d5687465a74 100755
(executable)
--- a/
tests/cli/convert/test_auto_source_discovery_log_level
+++ b/
tests/cli/convert/test_auto_source_discovery_log_level
@@
-1,19
+1,9
@@
#!/bin/bash
#
#!/bin/bash
#
-# Copyright (C) 2019 Simon Marchi <simon.marchi@efficios.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
#
#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
+# Copyright (C) 2019 Simon Marchi <simon.marchi@efficios.com>
#
#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# Test how log level options are applied to sources auto-discovered by the
# convert command.
# Test how log level options are applied to sources auto-discovered by the
# convert command.
@@
-39,7
+29,7
@@
dir_ab="${data_dir}/dir-ab"
expected_file=$(mktemp -t expected.XXXXXX)
expected_file=$(mktemp -t expected.XXXXXX)
-print_log_level=
"--params what=\"log-level\""
+print_log_level=
(--params 'what="log-level"')
details_sink=("-c" "sink.text.details" "--params=with-metadata=false")
debug=2
details_sink=("-c" "sink.text.details" "--params=with-metadata=false")
debug=2
@@
-68,8
+58,8
@@
END
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
- "${dir_ab}" --log-level DEBUG
${print_log_level}
\
- ${details_sink[@]}
+ "${dir_ab}" --log-level DEBUG
"${print_log_level[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply log level to two components from one non-option argument"
# Apply log level to two components from two distinct non-option arguments.
ok "$?" "apply log level to two components from one non-option argument"
# Apply log level to two components from two distinct non-option arguments.
@@
-95,8
+85,8
@@
END
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
- "${dir_a}" --log-level DEBUG
${print_log_level} "${dir_b}" --log-level TRACE ${print_log_level}
\
- ${details_sink[@]}
+ "${dir_a}" --log-level DEBUG
"${print_log_level[@]}" "${dir_b}" --log-level TRACE "${print_log_level[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply log level to two non-option arguments"
# Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1).
ok "$?" "apply log level to two non-option arguments"
# Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1).
@@
-122,8
+112,8
@@
END
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
- "${dir_a}" --log-level DEBUG
${print_log_level} "${dir_ab}" --log-level TRACE ${print_log_level}
\
- ${details_sink[@]}
+ "${dir_a}" --log-level DEBUG
"${print_log_level[@]}" "${dir_ab}" --log-level TRACE "${print_log_level[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
# Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2).
ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
# Apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2).
@@
-149,8
+139,8
@@
END
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
bt_diff_cli "$expected_file" "/dev/null" \
--plugin-path "${plugin_dir}" convert \
- "${dir_ab}" --log-level DEBUG
${print_log_level} "${dir_a}" --log-level TRACE ${print_log_level}
\
- ${details_sink[@]}
+ "${dir_ab}" --log-level DEBUG
"${print_log_level[@]}" "${dir_a}" --log-level TRACE "${print_log_level[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2)"
rm -f "$expected_file"
ok "$?" "apply log level to one component coming from one non-option argument and one component coming from two non-option arguments (2)"
rm -f "$expected_file"
This page took
0.025029 seconds
and
4
git commands to generate.