From c3ca8136b3e3bae030f3428bebe1dc6a57f8f6c2 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 10 Nov 2023 09:04:42 -0500 Subject: [PATCH] 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 Change-Id: I58caf29067a45495a1e80a9937d937a87b14c969 --- tests/bindings/python/bt2/test-python-bt2.sh | 2 +- tests/lib/conds/test-conds.sh | 2 +- tests/plugins/sink.text.pretty/test-pretty-python.sh | 2 +- tests/plugins/src.ctf.fs/query/test-query-support-info.sh | 2 +- tests/plugins/src.ctf.fs/query/test-query-trace-info.sh | 2 +- tests/python-plugin-provider/test-python-plugin-provider.sh | 2 +- tests/utils/utils.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/bindings/python/bt2/test-python-bt2.sh b/tests/bindings/python/bt2/test-python-bt2.sh index a32362f3..e05cd8e7 100755 --- 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 af66f6d2..37e71c5f 100755 --- 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 fe395e77..d967073c 100755 --- 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 51044628..4c458023 100755 --- 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 49f316bb..1c5b6564 100755 --- 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 542c1748..8fba060c 100755 --- 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 b14b8064..59f5eca1 100644 --- 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 -- 2.34.1