projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configure: allow adding compiler-specific warning flags
[babeltrace.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 6abc4e6084b6693f509ef99e47375b68925d49d1..6c87f309df9efdbb6ac66437fab9727e89d1e358 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-90,7
+90,7
@@
BT_PLUGINS_PATH="${BT_TESTS_BUILDDIR}/../src/plugins"
# Allow overriding the babeltrace2 plugin path
if [ "x${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" = "x" ]; then
# Allow overriding the babeltrace2 plugin path
if [ "x${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" = "x" ]; then
- BT_TESTS_BABELTRACE_PLUGIN_PATH="${BT_PLUGINS_PATH}/ctf:${BT_PLUGINS_PATH}/utils:${BT_PLUGINS_PATH}/text"
+ BT_TESTS_BABELTRACE_PLUGIN_PATH="${BT_PLUGINS_PATH}/ctf:${BT_PLUGINS_PATH}/utils:${BT_PLUGINS_PATH}/text
:${BT_PLUGINS_PATH}/lttng-utils
"
fi
if [ "x${BT_TESTS_PROVIDER_DIR:-}" = "x" ]; then
fi
if [ "x${BT_TESTS_PROVIDER_DIR:-}" = "x" ]; then
@@
-134,6
+134,12
@@
export BT_TESTS_SED_BIN
BT_TESTS_DATADIR="${BT_TESTS_SRCDIR}/data"
BT_CTF_TRACES_PATH="${BT_TESTS_DATADIR}/ctf-traces"
BT_TESTS_DATADIR="${BT_TESTS_SRCDIR}/data"
BT_CTF_TRACES_PATH="${BT_TESTS_DATADIR}/ctf-traces"
+# Remove CR characters in file "$1".
+
+bt_remove_cr() {
+ "$BT_TESTS_SED_BIN" -i 's/\r//g' "$1"
+}
+
# Run the Babeltrace CLI, redirecting stdout and stderr to specified files.
#
# $1: file to redirect stdout to
# Run the Babeltrace CLI, redirecting stdout and stderr to specified files.
#
# $1: file to redirect stdout to
@@
-173,7
+179,7
@@
bt_diff() {
# Strip any \r present due to Windows (\n -> \r\n).
# "diff --string-trailing-cr" is not used since it is not present on
# Solaris.
# Strip any \r present due to Windows (\n -> \r\n).
# "diff --string-trailing-cr" is not used since it is not present on
# Solaris.
-
"$BT_TESTS_SED_BIN" -i 's/\r//g'
"$actual_file"
+
bt_remove_cr
"$actual_file"
diff -u "$expected_file" "$actual_file" 1>&2
diff -u "$expected_file" "$actual_file" 1>&2
@@
-241,7
+247,8
@@
bt_diff_details_ctf_single() {
expected_stderr_file="/dev/null"
# Compare using the CLI with `sink.text.details`
expected_stderr_file="/dev/null"
# Compare using the CLI with `sink.text.details`
- bt_diff_cli "$expected_stdout_file" "$expected_stderr_file" "$trace_dir" "-c" "sink.text.details" "${extra_details_args[@]}"
+ bt_diff_cli "$expected_stdout_file" "$expected_stderr_file" "$trace_dir" \
+ "-c" "sink.text.details" "${extra_details_args[@]+${extra_details_args[@]}}"
}
# Calls bt_diff_details_ctf_single(), except that "$1" is the path to a
}
# Calls bt_diff_details_ctf_single(), except that "$1" is the path to a
@@
-267,7
+274,8
@@
bt_diff_details_ctf_gen_single() {
fi
# Compare using the CLI with `sink.text.details`
fi
# Compare using the CLI with `sink.text.details`
- bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" "${extra_details_args[@]}"
+ bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" \
+ "${extra_details_args[@]+${extra_details_args[@]}}"
ret=$?
rm -rf "$temp_trace_dir"
return $ret
ret=$?
rm -rf "$temp_trace_dir"
return $ret
This page took
0.025224 seconds
and
4
git commands to generate.