X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;fp=tests%2Futils%2Futils.sh;h=6c87f309df9efdbb6ac66437fab9727e89d1e358;hp=36c75fe05a350cf5f172a1ecde769ee14f878c02;hb=90a8a0f23a364a3e1e3b7702c57b9c22473500a3;hpb=9c878ece51a647c6462a9cd3a8a6f6fc8ba437a7

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 36c75fe0..6c87f309 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -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"
 
+# 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
@@ -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.
-	"$BT_TESTS_SED_BIN" -i 's/\r//g' "$actual_file"
+	bt_remove_cr "$actual_file"
 
 	diff -u "$expected_file" "$actual_file" 1>&2