X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=59f5eca11799cb1ee101872554b28d830f2b1040;hb=c3ca8136b3e3bae030f3428bebe1dc6a57f8f6c2;hp=10d984441e22dd51a1b603fe4d137d145bd32f9f;hpb=82057d0ccb3be005f1c1d292a3ae663dec6499ad;p=babeltrace.git

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 10d98444..59f5eca1 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -128,7 +128,7 @@ fi
 export BT_TESTS_BT2_BIN
 
 # This doesn't need to be exported, but it needs to remain set for
-# run_python_bt2() to use it.
+# bt_run_in_py_env() to use it.
 #
 # TODO: Remove when `tests/bindings/python/bt2/test_plugin.py` is fixed.
 _bt_tests_plugins_path=$BT_TESTS_BUILDDIR/../src/plugins
@@ -155,7 +155,7 @@ _bt_tests_set_var_def BT_TESTS_PYTHON_BIN python3
 # Major and minor version of the `python3` command to use when testing.
 #
 # This doesn't need to be exported, but it needs to remain set for
-# run_python() to use it.
+# 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))')
 
 # Name of the `python3-config` command to use when testing, if not set
@@ -222,7 +222,7 @@ bt_cli() {
 	local -r args=("$@")
 
 	echo "Running: \`$BT_TESTS_BT2_BIN ${args[*]}\`" >&2
-	run_python_bt2 "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file"
+	bt_run_in_py_env "$BT_TESTS_BT2_BIN" "${args[@]}" 1>"$stdout_file" 2>"$stderr_file"
 }
 
 # Checks the differences between:
@@ -376,7 +376,7 @@ _bt_tests_check_coverage() {
 
 # Executes a command within an environment which can import the testing
 # Python modules (in `tests/utils/python`).
-run_python() {
+bt_run_in_py_utils_env() {
 	local our_pythonpath=$BT_TESTS_SRCDIR/utils/python
 
 	if [[ $_bt_tests_py3_version =~ 3.[45] ]]; then
@@ -391,7 +391,7 @@ run_python() {
 
 # Executes a command within an environment which can import the testing
 # Python modules (in `tests/utils/python`) and the `bt2` Python package.
-run_python_bt2() {
+bt_run_in_py_env() {
 	local -x BABELTRACE_PLUGIN_PATH=$BT_TESTS_BABELTRACE_PLUGIN_PATH
 	local -x LIBBABELTRACE2_PLUGIN_PROVIDER_DIR=$BT_TESTS_PROVIDER_DIR
 	local -x BT_TESTS_DATADIR=$BT_TESTS_DATADIR
@@ -436,16 +436,16 @@ run_python_bt2() {
 		local -x ASAN_OPTIONS=${ASAN_OPTIONS:-}${ASAN_OPTIONS:+,}detect_leaks=0
 	fi
 
-	run_python "$@"
+	bt_run_in_py_utils_env "$@"
 }
 
 # Runs the Python tests matching the pattern `$2` (optional, `*` if
 # missing) in the directory `$1` using `testrunner.py`.
 #
-# This function uses run_python_bt2(), therefore such tests can import
+# This function uses bt_run_in_py_env(), therefore such tests can import
 # the testing Python modules (in `tests/utils/python`) and the `bt2`
 # Python package.
-run_python_bt2_test() {
+bt_run_py_test() {
 	local -r test_dir=$1
 	local -r test_pattern=${2:-*}
 	local python_exec
@@ -456,7 +456,7 @@ run_python_bt2_test() {
 		python_exec=$BT_TESTS_PYTHON_BIN
 	fi
 
-	run_python_bt2 \
+	bt_run_in_py_env \
 		"$python_exec" "$BT_TESTS_SRCDIR/utils/python/testrunner.py" \
 		--pattern "$test_pattern" "$test_dir"
 
@@ -485,5 +485,5 @@ gen_mctf_trace() {
 	)
 
 	echo "Running: \`${cmd[*]}\`" >&2
-	run_python "${cmd[@]}"
+	bt_run_in_py_utils_env "${cmd[@]}"
 }