# 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
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
shift 2
local args=("$@")
+ echo "Running: $BT_TESTS_BT2_BIN ${args[*]}" >&2
run_python_bt2 "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file"
}
# $1: file 1 (expected)
# $2: file 2 (actual)
#
-# Return 0 if there's no difference, and 1 if there are.
+# Return 0 if there's no difference, and non-zero if there are.
#
# Note that this function modifies the actual output file ($2) _in-place_ to
# remove any \r character.
bt_diff() {
local expected_file="$1"
local actual_file="$2"
- shift 2
- local args=("$@")
local ret=0
- local temp_diff
-
- temp_diff="$(mktemp -t diff.XXXXXX)"
# 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"
-
- if ! diff -u "$expected_file" "$actual_file" > "$temp_diff"; then
- echo "ERROR: for '${args[*]}': output does not match:" >&2
- cat "$temp_diff" >&2
- ret=1
- fi
+ bt_remove_cr "$actual_file"
- rm -f "$temp_diff"
+ diff -u "$expected_file" "$actual_file" 1>&2
- return $ret
+ return $?
}
# Checks the difference between:
return $ret
}
-# Checks the difference between:
-#
-# 1. What the CLI outputs on its standard output when given the arguments
-# "$@" (excluding the first two arguments), sorted with the default "sort".
-# 2. The file with path "$1".
-#
-# And the difference between:
-#
-# 1. What the CLI outputs on its standard error when given the arguments
-# "$@" (excluding the first two arguments).
-# 2. The file with path "$2".
-#
-# Returns 0 if there's no difference, and 1 if there is, also printing
-# said difference to the standard error.
-bt_diff_cli_sorted() {
- local expected_stdout_file="$1"
- local expected_stderr_file="$2"
- shift 2
- local args=("$@")
-
- local temp_stdout_output_file
- local temp_stderr_output_file
- local ret=0
- local ret_stdout
- local ret_stderr
-
- temp_stdout_output_file="$(mktemp -t actual_stdout.XXXXXX)"
- temp_stderr_output_file="$(mktemp -t actual_stderr.XXXXXX)"
-
- # Run the CLI to get a detailed file.
- bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" "${args[@]}"
-
- # Sort the stdout file, use a subshell to do it in-place
- # shellcheck disable=SC2005
- echo "$(LC_ALL=C sort "$temp_stdout_output_file")" > "$temp_stdout_output_file"
-
- bt_diff "$expected_stdout_file" "$temp_stdout_output_file" "${args[@]}"
- ret_stdout=$?
- bt_diff "$expected_stderr_file" "$temp_stderr_output_file" "${args[@]}"
- ret_stderr=$?
-
- if ((ret_stdout != 0 || ret_stderr != 0)); then
- ret=1
- fi
-
- rm -f "$temp_stdout_output_file" "$temp_stderr_output_file"
-
- return $ret
-}
-
# Checks the difference between the content of the file with path "$1"
# and the output of the CLI when called on the directory path "$2" with
# the arguments '-c sink.text.details' and the rest of the arguments to
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
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
"BABELTRACE_PYTHON_BT2_NO_TRACEBACK=1" \
"BABELTRACE_PLUGIN_PATH=${BT_TESTS_BABELTRACE_PLUGIN_PATH}" \
"LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=${BT_TESTS_PROVIDER_DIR}" \
+ "BT_TESTS_DATADIR=${BT_TESTS_DATADIR}" \
"BT_CTF_TRACES_PATH=${BT_CTF_TRACES_PATH}" \
"BT_PLUGINS_PATH=${BT_PLUGINS_PATH}" \
"PYTHONPATH=${BT_TESTS_PYTHONPATH}:${BT_TESTS_SRCDIR}/utils/python"