projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests/utils/utils.sh: run_python_bt2_test(): use `local -r` when possible
[babeltrace.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 937496457b70ade86e19b63f67ecf22123016e65..aa7353b7781846c708b4b5c2d9a3037dd3af72cf 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-273,26
+273,21
@@
bt_diff() {
# Returns 0 if there's no difference, or 1 otherwise, also printing said
# difference to the standard error.
bt_diff_cli() {
# Returns 0 if there's no difference, or 1 otherwise, also printing said
# difference to the standard error.
bt_diff_cli() {
- local expected_stdout_file="$1"
- local expected_stderr_file="$2"
+ local
-r
expected_stdout_file="$1"
+ local
-r
expected_stderr_file="$2"
shift 2
shift 2
- local args=("$@")
+ local
-r
args=("$@")
- local
temp_stdout_output_file
- local
temp_stderr_output_file
+ local
-r temp_stdout_output_file="$(mktemp -t actual-stdout.XXXXXX)"
+ local
-r temp_stderr_output_file="$(mktemp -t actual-stderr.XXXXXX)"
local ret=0
local ret=0
- local ret_stdout
- local ret_stderr
-
- temp_stdout_output_file="$(mktemp -t actual-stdout.XXXXXX)"
- temp_stderr_output_file="$(mktemp -t actual-stderr.XXXXXX)"
bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" "${args[@]}"
bt_diff "$expected_stdout_file" "$temp_stdout_output_file" "${args[@]}"
bt_cli "$temp_stdout_output_file" "$temp_stderr_output_file" "${args[@]}"
bt_diff "$expected_stdout_file" "$temp_stdout_output_file" "${args[@]}"
- ret_stdout=$?
+
local -r
ret_stdout=$?
bt_diff "$expected_stderr_file" "$temp_stderr_output_file" "${args[@]}"
bt_diff "$expected_stderr_file" "$temp_stderr_output_file" "${args[@]}"
- ret_stderr=$?
+
local -r
ret_stderr=$?
if ((ret_stdout != 0 || ret_stderr != 0)); then
ret=1
if ((ret_stdout != 0 || ret_stderr != 0)); then
ret=1
@@
-317,10
+312,10
@@
bt_diff_cli() {
# Returns 0 if there's no difference, or 1 otherwise, also printing said
# difference to the standard error.
bt_diff_details_ctf_single() {
# Returns 0 if there's no difference, or 1 otherwise, also printing said
# difference to the standard error.
bt_diff_details_ctf_single() {
- local expected_stdout_file="$1"
- local trace_dir="$2"
+ local
-r
expected_stdout_file="$1"
+ local
-r
trace_dir="$2"
shift 2
shift 2
- local extra_details_args=("$@")
+ local
-r
extra_details_args=("$@")
expected_stderr_file="/dev/null"
# Compare using the CLI with `sink.text.details`
expected_stderr_file="/dev/null"
# Compare using the CLI with `sink.text.details`
@@
-334,15
+329,12
@@
bt_diff_details_ctf_single() {
# The program `$1` receives the path to a temporary, empty directory
# where to write the CTF trace as its first argument.
bt_diff_details_ctf_gen_single() {
# The program `$1` receives the path to a temporary, empty directory
# where to write the CTF trace as its first argument.
bt_diff_details_ctf_gen_single() {
- local ctf_gen_prog_path="$1"
- local expected_stdout_file="$2"
+ local
-r
ctf_gen_prog_path="$1"
+ local
-r
expected_stdout_file="$2"
shift 2
shift 2
- local extra_details_args=("$@")
-
- local temp_trace_dir
- local ret
+ local -r extra_details_args=("$@")
- temp_trace_dir="$(mktemp -d)"
+
local -r
temp_trace_dir="$(mktemp -d)"
# Run the CTF trace generator program to get a CTF trace
if ! "$ctf_gen_prog_path" "$temp_trace_dir" 2>/dev/null; then
# Run the CTF trace generator program to get a CTF trace
if ! "$ctf_gen_prog_path" "$temp_trace_dir" 2>/dev/null; then
@@
-354,7
+346,7
@@
bt_diff_details_ctf_gen_single() {
# Compare using the CLI with `sink.text.details`
bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" \
"${extra_details_args[@]+${extra_details_args[@]}}"
# Compare using the CLI with `sink.text.details`
bt_diff_details_ctf_single "$expected_stdout_file" "$temp_trace_dir" \
"${extra_details_args[@]+${extra_details_args[@]}}"
- ret=$?
+
local -r
ret=$?
rm -rf "$temp_trace_dir"
return $ret
}
rm -rf "$temp_trace_dir"
return $ret
}
@@
-367,13
+359,13
@@
bt_grep() {
# ok() with the test name `$3` on the result of bt_grep() matching the
# pattern `$1` within the file `$2`.
bt_grep_ok() {
# ok() with the test name `$3` on the result of bt_grep() matching the
# pattern `$1` within the file `$2`.
bt_grep_ok() {
- local pattern=$1
- local file=$2
- local test_name=$3
+ local
-r
pattern=$1
+ local
-r
file=$2
+ local
-r
test_name=$3
bt_grep --silent "$pattern" "$file"
bt_grep --silent "$pattern" "$file"
- local ret=$?
+ local
-r
ret=$?
if ! ok $ret "$test_name"; then
{
if ! ok $ret "$test_name"; then
{
@@
-410,7
+402,6
@@
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() {
# 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() {
- local lib_asan
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}"
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}"
@@
-418,7
+409,7
@@
run_python_bt2() {
local -x "BT_PLUGINS_PATH=${_bt_tests_plugins_path}"
local -x "PYTHONPATH=${BT_TESTS_PYTHONPATH}${PYTHONPATH:+:}${PYTHONPATH:-}"
local -x "BT_PLUGINS_PATH=${_bt_tests_plugins_path}"
local -x "PYTHONPATH=${BT_TESTS_PYTHONPATH}${PYTHONPATH:+:}${PYTHONPATH:-}"
- local main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
+ local
-r
main_lib_path="${BT_TESTS_BUILDDIR}/../src/lib/.libs"
# Set the library search path so that the Python 3 interpreter can
# load `libbabeltrace2`.
# Set the library search path so that the Python 3 interpreter can
# load `libbabeltrace2`.
@@
-449,7
+440,7
@@
run_python_bt2() {
# override the user's value if it contains `detect_leaks=1`.
if [ "${BT_TESTS_ENABLE_ASAN:-}" = "1" ]; then
if "${BT_TESTS_CC_BIN}" --version | head -n 1 | bt_grep -q '^gcc'; then
# override the user's value if it contains `detect_leaks=1`.
if [ "${BT_TESTS_ENABLE_ASAN:-}" = "1" ]; then
if "${BT_TESTS_CC_BIN}" --version | head -n 1 | bt_grep -q '^gcc'; then
- lib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)"
+ l
ocal -r l
ib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)"
local -x LD_PRELOAD="${lib_asan}${LD_PRELOAD:+:}${LD_PRELOAD:-}"
fi
local -x LD_PRELOAD="${lib_asan}${LD_PRELOAD:+:}${LD_PRELOAD:-}"
fi
@@
-466,16
+457,8
@@
run_python_bt2() {
# the testing Python modules (in `tests/utils/python`) and the `bt2`
# Python package.
run_python_bt2_test() {
# the testing Python modules (in `tests/utils/python`) and the `bt2`
# Python package.
run_python_bt2_test() {
- local test_dir="$1"
- local test_pattern="${2:-'*'}"
-
- local ret
- local test_runner_args=()
-
- test_runner_args+=("$test_dir")
- if [ -n "${test_pattern}" ]; then
- test_runner_args+=("${test_pattern}")
- fi
+ local -r test_dir="$1"
+ local -r test_pattern="${2:-'*'}"
if test "${BT_TESTS_COVERAGE:-}" = "1"; then
python_exec="check_coverage"
if test "${BT_TESTS_COVERAGE:-}" = "1"; then
python_exec="check_coverage"
@@
-489,7
+472,7
@@
run_python_bt2_test() {
--pattern "$test_pattern" \
"$test_dir" \
--pattern "$test_pattern" \
"$test_dir" \
- ret=$?
+
local -r
ret=$?
if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then
coverage report -m
if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then
coverage report -m
This page took
0.0268 seconds
and
4
git commands to generate.