From: Philippe Proulx <eeppeliteloop@gmail.com>
Date: Fri, 10 Nov 2023 04:03:26 +0000 (-0500)
Subject: tests/utils/utils.sh: use a function to source `env.sh`
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=4a1628932a4f566033bd1e06add80f0b79482c46

tests/utils/utils.sh: use a function to source `env.sh`

By using a function to do this, we can use a local variable to hold the
`env.sh` path and therefore remove redundancy.

Disabling SC1090 because it's a non-constant source now, but it's
useless to add `source=` here because SC1091 is already disabled.

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: Ie449fd8f0cd04074b87b967d8b0ec719094f378c
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 4e033b79..dc4dbdc7 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -95,11 +95,18 @@ _set_vars_srcdir_builddir() {
 _set_vars_srcdir_builddir
 unset -f _set_vars_srcdir_builddir
 
-# Source the generated environment file if it's present
-if [ -f "${BT_TESTS_BUILDDIR}/utils/env.sh" ]; then
-	# shellcheck disable=SC1091
-	. "${BT_TESTS_BUILDDIR}/utils/env.sh"
-fi
+# Sources the generated environment file (`env.sh`) if it exists.
+_source_env_sh() {
+	local -r env_sh_path="$BT_TESTS_BUILDDIR/utils/env.sh"
+
+	if [ -f "${env_sh_path}" ]; then
+		# shellcheck disable=SC1090,SC1091
+		. "${env_sh_path}"
+	fi
+}
+
+_source_env_sh
+unset -f _source_env_sh
 
 # Path to the `babeltrace2` command, if not set
 if [ -z "${BT_TESTS_BT2_BIN:-}" ]; then