# Remove CR characters in file "$1".
bt_remove_cr() {
- "$BT_TESTS_SED_BIN" -i 's/\r//g' "$1"
+ "$BT_TESTS_SED_BIN" -i'' -e 's/\r//g' "$1"
}
# Run the Babeltrace CLI, redirecting stdout and stderr to specified files.
local ret_stdout
local ret_stderr
- temp_stdout_output_file="$(mktemp -t actual_stdout.XXXXXX)"
- temp_stderr_output_file="$(mktemp -t actual_stderr.XXXXXX)"
+ 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[@]}"
run_python() {
local our_pythonpath="${BT_TESTS_SRCDIR}/utils/python"
- if [[ $BT_TESTS_PYTHON_VERSION = 3.4 ]]; then
+ if [[ $BT_TESTS_PYTHON_VERSION =~ 3.[45] ]]; then
# Add a local directory containing a `typing.py` to `PYTHONPATH` for
# Python 3.4 which doesn't offer the `typing` module.
our_pythonpath="$our_pythonpath:${BT_TESTS_SRCDIR}/utils/python/typing"
return $ret
}
+
+# Generate a CTF trace using `mctf.py`.
+#
+# $1: Input filename
+# $2: Base directory path for output files
+gen_mctf_trace() {
+ local input_file="$1"
+ local base_dir="$2"
+
+ diag "Running: ${BT_TESTS_PYTHON_BIN} ${BT_TESTS_SRCDIR}/utils/python/mctf.py --base-dir ${base_dir} ${input_file}"
+ run_python "${BT_TESTS_PYTHON_BIN}" "${BT_TESTS_SRCDIR}/utils/python/mctf.py" \
+ --base-dir "${base_dir}" "${input_file}"
+}