projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: use -z / -n to test for string empty / non-empty
[babeltrace.git]
/
tests
/
cli
/
convert
/
test_auto_source_discovery_params
diff --git
a/tests/cli/convert/test_auto_source_discovery_params
b/tests/cli/convert/test_auto_source_discovery_params
index 3619a31eec29eb55a330881461321aee33a86075..65ef536fb1d0aafde4dc4d6e1fc0dc9c1616615b 100755
(executable)
--- a/
tests/cli/convert/test_auto_source_discovery_params
+++ b/
tests/cli/convert/test_auto_source_discovery_params
@@
-1,24
+1,14
@@
#!/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 parameters are applied to sources auto-discovered by the convert
# command.
# Test how parameters are applied to sources auto-discovered by the convert
# command.
-if [
"x${BT_TESTS_SRCDIR:-}" != "x
" ]; then
+if [
-n "${BT_TESTS_SRCDIR:-}
" ]; then
UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh"
else
UTILSSH="$(dirname "$0")/../../utils/utils.sh"
UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh"
else
UTILSSH="$(dirname "$0")/../../utils/utils.sh"
@@
-39,7
+29,7
@@
dir_ab="${data_dir}/dir-ab"
expected_file=$(mktemp -t expected.XXXXXX)
expected_file=$(mktemp -t expected.XXXXXX)
-print_test_params=
"--params what=\"test-params\""
+print_test_params=
("--params" 'what="test-params"')
details_sink=("-c" "sink.text.details" "--params=with-metadata=false")
# Apply params to two components from one non-option argument.
details_sink=("-c" "sink.text.details" "--params=with-metadata=false")
# Apply params to two components from one non-option argument.
@@
-65,8
+55,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}" --params 'test-allo="madame"'
${print_test_params}
\
- ${details_sink[@]}
+ "${dir_ab}" --params 'test-allo="madame"'
"${print_test_params[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply params to two components from one non-option argument"
# Apply params to two components from two distinct non-option arguments.
ok "$?" "apply params to two components from one non-option argument"
# Apply params to two components from two distinct non-option arguments.
@@
-92,8
+82,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}" --params 'test-allo="madame"'
${print_test_params} "${dir_b}" --params 'test-bonjour="monsieur"' ${print_test_params}
\
- ${details_sink[@]}
+ "${dir_a}" --params 'test-allo="madame"'
"${print_test_params[@]}" "${dir_b}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply params to two non-option arguments"
# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1).
ok "$?" "apply params to two non-option arguments"
# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1).
@@
-119,8
+109,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}" --params 'test-allo="madame"'
${print_test_params} "${dir_ab}" --params 'test-bonjour="monsieur"' ${print_test_params}
\
- ${details_sink[@]}
+ "${dir_a}" --params 'test-allo="madame"'
"${print_test_params[@]}" "${dir_ab}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (2).
ok "$?" "apply params to one component coming from one non-option argument and one component coming from two non-option arguments (1)"
# Apply params to one component coming from one non-option argument and one component coming from two non-option arguments (2).
@@
-146,8
+136,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}" --params 'test-bonjour="madame",test-salut="les amis"'
${print_test_params} "${dir_a}" --params 'test-bonjour="monsieur"' ${print_test_params}
\
- ${details_sink[@]}
+ "${dir_ab}" --params 'test-bonjour="madame",test-salut="les amis"'
"${print_test_params[@]}" "${dir_a}" --params 'test-bonjour="monsieur"' "${print_test_params[@]}"
\
+ "${details_sink[@]}"
ok "$?" "apply params 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 params 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.036619 seconds
and
4
git commands to generate.