Re-format with clang-format 16

[babeltrace.git] / tests / utils / utils.sh

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 5c7b3eeb54e43bb465c1225da9292e258a2a2811..f3d4d94572482114443dd0f21dbbbb67bf78d18e 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -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
 }
 
@@ -430,7 +440,8 @@ bt_run_in_py_env() {
        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:-}
+                       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")"
+}