X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=9081a88e2e871324448adfc0620bae33db4cc4fb;hp=60e5d56e8bd5daaac2d8d21de921856f9e461c31;hb=HEAD;hpb=2fb231c047e483af94e4664c1316d7943aaa4c0e

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 60e5d56e..f3d4d945 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -156,7 +156,7 @@ _bt_tests_set_var_def BT_TESTS_PYTHON_BIN python3
 #
 # This doesn't need to be exported, but it needs to remain set for
 # bt_run_in_py_utils_env() to use it.
-_bt_tests_py3_version=$("$BT_TESTS_PYTHON_BIN" -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
+_bt_tests_py3_version=$($BT_TESTS_PYTHON_BIN -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
 
 # Name of the `python3-config` command to use when testing, if not set
 _bt_tests_set_var_def BT_TESTS_PYTHON_CONFIG_BIN python3-config
@@ -219,10 +219,10 @@ bt_cli() {
 
 	shift 2
 
-	local -r args=("$@")
+	local -a bt_cli_args=("$@")
 
-	echo "Running: \`$BT_TESTS_BT2_BIN ${args[*]}\`" >&2
-	bt_run_in_py_env "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file"
+	echo "Running: \`$BT_TESTS_BT2_BIN ${bt_cli_args[*]}\`" >&2
+	bt_run_in_py_env "$BT_TESTS_BT2_BIN" "${bt_cli_args[@]}" 1>"$stdout_file" 2>"$stderr_file"
 }
 
 # Checks the differences between:
@@ -239,6 +239,16 @@ bt_diff() {
 	local -r expected_file=$1
 	local -r actual_file=$2
 
+	if [[ ! -e $expected_file ]]; then
+		echo "ERROR: expected file \`$expected_file\` doesn't exist" >&2
+		return 1
+	fi
+
+	if [[ ! -e $actual_file ]]; then
+		echo "ERROR: actual file \`$actual_file\` doesn't exist" >&2
+		return 1
+	fi
+
 	diff -u <(bt_remove_cr_inline "$expected_file") <(bt_remove_cr_inline "$actual_file") 1>&2
 }
 
@@ -318,7 +328,7 @@ bt_diff_details_ctf_gen_single() {
 
 	shift 2
 
-	local -r extra_details_args=("$@")
+	local -r gen_extra_details_args=("$@")
 	local -r temp_trace_dir=$(mktemp -d)
 
 	# Run the CTF trace generator program to get a CTF trace
@@ -330,7 +340,7 @@ bt_diff_details_ctf_gen_single() {
 
 	# Compare using the CLI with `sink.text.details`
 	bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" \
-		"${extra_details_args[@]+${extra_details_args[@]}}"
+		"${gen_extra_details_args[@]+${gen_extra_details_args[@]}}"
 
 	local -r ret=$?
 
@@ -416,7 +426,7 @@ bt_run_in_py_env() {
 	if [[ $BT_TESTS_OS_TYPE == mingw ]]; then
 		local -x PYTHONHOME
 
-		PYTHONHOME=$("$BT_TESTS_PYTHON_CONFIG_BIN" --prefix)
+		PYTHONHOME=$($BT_TESTS_PYTHON_CONFIG_BIN --prefix)
 	fi
 
 	# If AddressSanitizer is used, we must preload `libasan.so` so that
@@ -428,9 +438,10 @@ bt_run_in_py_env() {
 	# Append it to existing `ASAN_OPTIONS` variable, such that we
 	# override the user's value if it contains `detect_leaks=1`.
 	if [[ ${BT_TESTS_ENABLE_ASAN:-} == 1 ]]; then
-		if "$BT_TESTS_CC_BIN" --version | head -n 1 | bt_grep -q '^gcc'; then
-			local -r lib_asan=$("$BT_TESTS_CC_BIN" -print-file-name=libasan.so)
-			local -x LD_PRELOAD=$lib_asan${LD_PRELOAD:+:}${LD_PRELOAD:-}
+		if $BT_TESTS_CC_BIN --version | head -n 1 | bt_grep -q '^gcc'; then
+			local -r lib_asan=$($BT_TESTS_CC_BIN -print-file-name=libasan.so)
+			local -r lib_stdcxx=$($BT_TESTS_CC_BIN -print-file-name=libstdc++.so)
+			local -x LD_PRELOAD=$lib_asan:$lib_stdcxx${LD_PRELOAD:+:}${LD_PRELOAD:-}
 		fi
 
 		local -x ASAN_OPTIONS=${ASAN_OPTIONS:-}${ASAN_OPTIONS:+,}detect_leaks=0
@@ -487,3 +498,9 @@ bt_gen_mctf_trace() {
 	echo "Running: \`${cmd[*]}\`" >&2
 	bt_run_in_py_utils_env "${cmd[@]}"
 }
+
+# Call `diag` with the contents of file `$1`.
+
+diag_file() {
+	diag "$(cat "$1")"
+}