X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=afdc856bf12ad07881ac962a679ad2226a4ef3f7;hb=a0baab4a979e830f7dc4698c20b71e84dea6ff9d;hp=36c75fe05a350cf5f172a1ecde769ee14f878c02;hpb=8b729209b7c727b0ec475db36f998c16f2c3236c;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 36c75fe0..afdc856b 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1,20 +1,10 @@
 #!/bin/bash
-
-# Copyright (c) 2019 Michael Jeanson <mjeanson@efficios.com>
-# Copyright (C) 2019 Philippe Proulx <pproulx@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; under version 2 of the License.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (c) 2019 Michael Jeanson <mjeanson@efficios.com>
+# Copyright (C) 2019 Philippe Proulx <pproulx@efficios.com>
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # This file is meant to be sourced at the start of shell script-based tests.
 
@@ -35,27 +25,27 @@ fi
 # We do a bit of translation to ease our life down the road for comparison.
 # Export it so that called executables can use it.
 # [1] https://en.wikipedia.org/wiki/Uname#Examples
-if [ "x${BT_OS_TYPE:-}" = "x" ]; then
-	BT_OS_TYPE="$(uname -s)"
-	case "$BT_OS_TYPE" in
+if [ "x${BT_TESTS_OS_TYPE:-}" = "x" ]; then
+	BT_TESTS_OS_TYPE="$(uname -s)"
+	case "$BT_TESTS_OS_TYPE" in
 	MINGW*)
-		BT_OS_TYPE="mingw"
+		BT_TESTS_OS_TYPE="mingw"
 		;;
 	Darwin)
-		BT_OS_TYPE="darwin"
+		BT_TESTS_OS_TYPE="darwin"
 		;;
 	Linux)
-		BT_OS_TYPE="linux"
+		BT_TESTS_OS_TYPE="linux"
 		;;
 	CYGWIN*)
-		BT_OS_TYPE="cygwin"
+		BT_TESTS_OS_TYPE="cygwin"
 		;;
 	*)
-		BT_OS_TYPE="unsupported"
+		BT_TESTS_OS_TYPE="unsupported"
 		;;
 	esac
 fi
-export BT_OS_TYPE
+export BT_TESTS_OS_TYPE
 
 # Allow overriding the source and build directories
 if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then
@@ -79,7 +69,7 @@ fi
 # Allow overriding the babeltrace2 executables
 if [ "x${BT_TESTS_BT2_BIN:-}" = "x" ]; then
 	BT_TESTS_BT2_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2"
-	if [ "$BT_OS_TYPE" = "mingw" ]; then
+	if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
 		BT_TESTS_BT2_BIN="${BT_TESTS_BT2_BIN}.exe"
 	fi
 fi
@@ -134,6 +124,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 +169,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
 
@@ -300,9 +296,9 @@ run_python_bt2() {
 	local main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
 
 	# Set the library search path so the python interpreter can load libbabeltrace2
-	if [ "$BT_OS_TYPE" = "mingw" ] || [ "$BT_OS_TYPE" = "cygwin" ]; then
+	if [ "$BT_TESTS_OS_TYPE" = "mingw" ] || [ "$BT_TESTS_OS_TYPE" = "cygwin" ]; then
 		env_args+=("PATH=${main_lib_path}:${PATH:-}")
-	elif [ "$BT_OS_TYPE" = "darwin" ]; then
+	elif [ "$BT_TESTS_OS_TYPE" = "darwin" ]; then
 		env_args+=("DYLD_LIBRARY_PATH=${main_lib_path}:${DYLD_LIBRARY_PATH:-}")
 	else
 		env_args+=("LD_LIBRARY_PATH=${main_lib_path}:${LD_LIBRARY_PATH:-}")
@@ -311,7 +307,7 @@ run_python_bt2() {
 	# On Windows, an embedded Python interpreter needs a way to locate the path
 	# to it's internal modules, set the prefix from python-config to the
 	# PYTHONHOME variable.
-	if [ "$BT_OS_TYPE" = "mingw" ]; then
+	if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
 		env_args+=("PYTHONHOME=$($BT_TESTS_PYTHON_CONFIG_BIN --prefix)")
 	fi