tests/utils/utils.sh: run_python_bt2_test() -> bt_run_py_test()

Adding the `bt_` prefix like other functions in `utils.sh` and
shortening the rest.

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

diff --git a/tests/bindings/python/bt2/test-python-bt2.sh b/tests/bindings/python/bt2/test-python-bt2.sh
index a32362f3d8784a56ca591b7c27f49ceae1f92bb0..e05cd8e743898f256af03a03502d16eabd171b74 100755 (executable)
--- a/tests/bindings/python/bt2/test-python-bt2.sh
+++ b/tests/bindings/python/bt2/test-python-bt2.sh
@@ -14,4 +14,4 @@ fi
 # shellcheck source=../../../utils/utils.sh
 source "$UTILSSH"
 
-run_python_bt2_test "${BT_TESTS_SRCDIR}/bindings/python/bt2" "test_*"
+bt_run_py_test "${BT_TESTS_SRCDIR}/bindings/python/bt2" "test_*"

diff --git a/tests/lib/conds/test-conds.sh b/tests/lib/conds/test-conds.sh
index af66f6d299fe2cac951b65a63f1bee873bde8a7f..37e71c5f514d218a18c1dd8f85dff621a93cb254 100755 (executable)
--- a/tests/lib/conds/test-conds.sh
+++ b/tests/lib/conds/test-conds.sh
@@ -20,4 +20,4 @@ if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
        BT_TESTS_LIB_CONDS_TRIGGER_BIN="$BT_TESTS_LIB_CONDS_TRIGGER_BIN.exe"
 fi
 
-run_python_bt2_test "$BT_TESTS_SRCDIR/$reldir" test.py
+bt_run_py_test "$BT_TESTS_SRCDIR/$reldir" test.py

diff --git a/tests/plugins/sink.text.pretty/test-pretty-python.sh b/tests/plugins/sink.text.pretty/test-pretty-python.sh
index fe395e773b5514b5e7ec84db87c608b4d5a8d613..d967073c2b8de4d1dad1f29cef33c1eb43f7174b 100755 (executable)
--- a/tests/plugins/sink.text.pretty/test-pretty-python.sh
+++ b/tests/plugins/sink.text.pretty/test-pretty-python.sh
@@ -14,4 +14,4 @@ fi
 # shellcheck source=../../utils/utils.sh
 source "$UTILSSH"
 
-run_python_bt2_test "${BT_TESTS_SRCDIR}/plugins/sink.text.pretty" "test_*"
+bt_run_py_test "${BT_TESTS_SRCDIR}/plugins/sink.text.pretty" "test_*"

diff --git a/tests/plugins/src.ctf.fs/query/test-query-support-info.sh b/tests/plugins/src.ctf.fs/query/test-query-support-info.sh
index 51044628d71be5bc1c7f1283f45866f3e5597bc9..4c458023d5a78634059c26785ef8cd2c9786d12f 100755 (executable)
--- a/tests/plugins/src.ctf.fs/query/test-query-support-info.sh
+++ b/tests/plugins/src.ctf.fs/query/test-query-support-info.sh
@@ -14,4 +14,4 @@ fi
 # shellcheck source=../../../utils/utils.sh
 source "$UTILSSH"
 
-run_python_bt2_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query_support_info.py
+bt_run_py_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query_support_info.py

diff --git a/tests/plugins/src.ctf.fs/query/test-query-trace-info.sh b/tests/plugins/src.ctf.fs/query/test-query-trace-info.sh
index 49f316bb85a960513455e88d23c5e3935e23a364..1c5b656418e71e3d6a234bcdc39b90516805ab70 100755 (executable)
--- a/tests/plugins/src.ctf.fs/query/test-query-trace-info.sh
+++ b/tests/plugins/src.ctf.fs/query/test-query-trace-info.sh
@@ -14,4 +14,4 @@ fi
 # shellcheck source=../../../utils/utils.sh
 source "$UTILSSH"
 
-run_python_bt2_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query_trace_info.py
+bt_run_py_test "${BT_TESTS_SRCDIR}/plugins/src.ctf.fs/query" test_query_trace_info.py

diff --git a/tests/python-plugin-provider/test-python-plugin-provider.sh b/tests/python-plugin-provider/test-python-plugin-provider.sh
index 542c174874363c3f00b0ca819df8b1915fce10a7..8fba060c7836229e595535e43e257781465af5b9 100755 (executable)
--- a/tests/python-plugin-provider/test-python-plugin-provider.sh
+++ b/tests/python-plugin-provider/test-python-plugin-provider.sh
@@ -16,6 +16,6 @@ source "$UTILSSH"
 
 export PYTHON_PLUGIN_PROVIDER_TEST_PLUGIN_PATH="${BT_TESTS_SRCDIR}/python-plugin-provider/bt_plugin_test_python_plugin_provider.py"
 
-run_python_bt2_test \
+bt_run_py_test \
        "${BT_TESTS_SRCDIR}/python-plugin-provider" \
        test_python_plugin_provider.py

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index b14b806429bfd8323e47efcd9c402ece8d8f444e..59f5eca11799cb1ee101872554b28d830f2b1040 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -445,7 +445,7 @@ bt_run_in_py_env() {
 # 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