From 75e396f6b20bdf52c76a3c7312e7fb815ac1e5e9 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 2 Aug 2022 15:21:21 -0400 Subject: [PATCH] tests: use -z / -n to test for string empty / non-empty shellcheck gives many warnings of this kind In env.sh.in line 44: if [ "x${BT_TESTS_CC_BIN:-}" = "x" ]; then ^---------------------^ SC2268 (style): Avoid x-prefix in comparisons as it no longer serves a purpose. Did you mean: if [ "${BT_TESTS_CC_BIN:-}" = "" ]; then Fix them by using test's -z and -n switches, which test for empty and non-empty strings, respectively. In some cases, we are checking for the string to have a specific value ( = "x1"), in which case I left the comparison, but just removed the leading x's. Change-Id: I3cd841d881916696419d540ed629e685d2edce9d Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/8635 Tested-by: jenkins --- tests/bindings/python/bt2/test_python_bt2 | 2 +- .../test_auto_source_discovery_grouping | 2 +- .../test_auto_source_discovery_log_level | 2 +- .../convert/test_auto_source_discovery_params | 2 +- tests/cli/convert/test_convert_args | 2 +- tests/cli/list-plugins/test_list_plugins | 2 +- tests/cli/params/test_params | 2 +- tests/cli/query/test_query | 2 +- tests/cli/test_exit_status | 2 +- tests/cli/test_help | 2 +- tests/cli/test_intersection | 2 +- tests/cli/test_output_ctf_metadata | 2 +- .../cli/test_output_path_ctf_non_lttng_trace | 2 +- tests/cli/test_packet_seq_num | 2 +- tests/cli/test_trace_copy | 2 +- tests/cli/test_trace_read | 2 +- tests/cli/test_trimmer | 2 +- tests/ctf-writer/test_ctf_writer | 2 +- tests/lib/conds/test_conds | 2 +- tests/lib/test_plugin | 2 +- .../test_bin_info_i386-linux-gnu | 2 +- .../test_bin_info_powerpc-linux-gnu | 2 +- .../test_bin_info_powerpc64le-linux-gnu | 2 +- .../test_bin_info_x86_64-linux-gnu | 2 +- .../test_dwarf_i386-linux-gnu | 2 +- .../test_dwarf_powerpc-linux-gnu | 2 +- .../test_dwarf_powerpc64le-linux-gnu | 2 +- .../test_dwarf_x86_64-linux-gnu | 2 +- .../flt.lttng-utils.debug-info/test_succeed | 2 +- .../flt.utils.muxer/succeed/test_succeed | 2 +- tests/plugins/flt.utils.trimmer/test_trimming | 2 +- .../plugins/sink.ctf.fs/succeed/test_succeed | 2 +- .../sink.ctf.fs/test_assume_single_trace | 2 +- tests/plugins/sink.ctf.fs/test_stream_names | 2 +- .../sink.text.details/succeed/test_succeed | 2 +- tests/plugins/sink.text.pretty/test_enum | 2 +- .../sink.text.pretty/test_pretty_python | 2 +- tests/plugins/src.ctf.fs/fail/test_fail | 2 +- .../src.ctf.fs/query/test_query_metadata_info | 2 +- .../src.ctf.fs/query/test_query_support_info | 2 +- .../src.ctf.fs/query/test_query_trace_info | 2 +- tests/plugins/src.ctf.fs/succeed/test_succeed | 2 +- .../src.ctf.fs/test_deterministic_ordering | 2 +- tests/plugins/src.ctf.lttng-live/test_live | 2 +- .../test_python_plugin_provider | 2 +- tests/utils/env.sh.in | 18 ++++----- tests/utils/run_python_bt2 | 4 +- tests/utils/utils.sh | 40 +++++++++---------- 48 files changed, 76 insertions(+), 76 deletions(-) diff --git a/tests/bindings/python/bt2/test_python_bt2 b/tests/bindings/python/bt2/test_python_bt2 index 54006588..a32362f3 100755 --- a/tests/bindings/python/bt2/test_python_bt2 +++ b/tests/bindings/python/bt2/test_python_bt2 @@ -5,7 +5,7 @@ # Copyright (C) 2017 Philippe Proulx # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/cli/convert/test_auto_source_discovery_grouping b/tests/cli/convert/test_auto_source_discovery_grouping index ba7f558a..e476c96c 100755 --- a/tests/cli/convert/test_auto_source_discovery_grouping +++ b/tests/cli/convert/test_auto_source_discovery_grouping @@ -7,7 +7,7 @@ # Test the auto source disovery mechanism of the CLI. -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/convert/test_auto_source_discovery_log_level b/tests/cli/convert/test_auto_source_discovery_log_level index b7163234..56df66fa 100755 --- a/tests/cli/convert/test_auto_source_discovery_log_level +++ b/tests/cli/convert/test_auto_source_discovery_log_level @@ -8,7 +8,7 @@ # Test how log level options are applied to sources auto-discovered by the # convert command. -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/convert/test_auto_source_discovery_params b/tests/cli/convert/test_auto_source_discovery_params index 446e6c42..65ef536f 100755 --- a/tests/cli/convert/test_auto_source_discovery_params +++ b/tests/cli/convert/test_auto_source_discovery_params @@ -8,7 +8,7 @@ # Test how parameters are applied to sources auto-discovered by the convert # command. -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/convert/test_convert_args b/tests/cli/convert/test_convert_args index 7ac9843e..cd7aab24 100755 --- a/tests/cli/convert/test_convert_args +++ b/tests/cli/convert/test_convert_args @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/list-plugins/test_list_plugins b/tests/cli/list-plugins/test_list_plugins index 3e42d1ad..595eb4db 100755 --- a/tests/cli/list-plugins/test_list_plugins +++ b/tests/cli/list-plugins/test_list_plugins @@ -5,7 +5,7 @@ # Copyright (C) 2019 EfficiOS Inc. # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/params/test_params b/tests/cli/params/test_params index 8f13ca60..c207532a 100755 --- a/tests/cli/params/test_params +++ b/tests/cli/params/test_params @@ -8,7 +8,7 @@ # Test how parameters are applied to sources auto-discovered by the convert # command. -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/query/test_query b/tests/cli/query/test_query index 21a35467..e44d6777 100755 --- a/tests/cli/query/test_query +++ b/tests/cli/query/test_query @@ -5,7 +5,7 @@ # Copyright (C) 2019 Simon Marchi # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/cli/test_exit_status b/tests/cli/test_exit_status index d76d5214..905a2eb3 100755 --- a/tests/cli/test_exit_status +++ b/tests/cli/test_exit_status @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_help b/tests/cli/test_help index fb7cb598..dca6cfe5 100755 --- a/tests/cli/test_help +++ b/tests/cli/test_help @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_intersection b/tests/cli/test_intersection index 2077ab94..df0f6504 100755 --- a/tests/cli/test_intersection +++ b/tests/cli/test_intersection @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_output_ctf_metadata b/tests/cli/test_output_ctf_metadata index a97af1df..58969f8a 100755 --- a/tests/cli/test_output_ctf_metadata +++ b/tests/cli/test_output_ctf_metadata @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_output_path_ctf_non_lttng_trace b/tests/cli/test_output_path_ctf_non_lttng_trace index d7700931..fc0158bf 100755 --- a/tests/cli/test_output_path_ctf_non_lttng_trace +++ b/tests/cli/test_output_path_ctf_non_lttng_trace @@ -17,7 +17,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_packet_seq_num b/tests/cli/test_packet_seq_num index c74b2957..341a9c26 100755 --- a/tests/cli/test_packet_seq_num +++ b/tests/cli/test_packet_seq_num @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_trace_copy b/tests/cli/test_trace_copy index 761465e5..e8c9b2c8 100755 --- a/tests/cli/test_trace_copy +++ b/tests/cli/test_trace_copy @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_trace_read b/tests/cli/test_trace_read index ce874af1..474015e0 100755 --- a/tests/cli/test_trace_read +++ b/tests/cli/test_trace_read @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/cli/test_trimmer b/tests/cli/test_trimmer index c40db035..4b415b47 100755 --- a/tests/cli/test_trimmer +++ b/tests/cli/test_trimmer @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/ctf-writer/test_ctf_writer b/tests/ctf-writer/test_ctf_writer index 15ad2e32..7616b691 100755 --- a/tests/ctf-writer/test_ctf_writer +++ b/tests/ctf-writer/test_ctf_writer @@ -5,7 +5,7 @@ # Copyright (C) 2013 Jérémie Galarneau # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/lib/conds/test_conds b/tests/lib/conds/test_conds index 851079a4..af66f6d2 100755 --- a/tests/lib/conds/test_conds +++ b/tests/lib/conds/test_conds @@ -4,7 +4,7 @@ # # Copyright (C) 2020 Philippe Proulx -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/lib/test_plugin b/tests/lib/test_plugin index f16f1bd0..b9a3fcda 100755 --- a/tests/lib/test_plugin +++ b/tests/lib/test_plugin @@ -5,7 +5,7 @@ # Copyright (C) 2017 Philippe Proulx # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu index 781d4889..2703f3e7 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_i386-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu index 30e7e7a3..d8f7ab43 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu index 7abf70c3..60407c50 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_powerpc64le-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu index 404ffe58..d0e59e28 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_bin_info_x86_64-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu index fa264887..03380c55 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_i386-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu index 2e71d00c..d60e08c5 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu index 0248299c..8656272d 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_powerpc64le-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu index b8deff28..8a7a3ebb 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu +++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu @@ -6,7 +6,7 @@ # Copyright (C) 2019 Michael Jeanson # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_succeed b/tests/plugins/flt.lttng-utils.debug-info/test_succeed index 3825b898..1df6fbb2 100755 --- a/tests/plugins/flt.lttng-utils.debug-info/test_succeed +++ b/tests/plugins/flt.lttng-utils.debug-info/test_succeed @@ -14,7 +14,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/flt.utils.muxer/succeed/test_succeed b/tests/plugins/flt.utils.muxer/succeed/test_succeed index 98cd6b95..578ac223 100755 --- a/tests/plugins/flt.utils.muxer/succeed/test_succeed +++ b/tests/plugins/flt.utils.muxer/succeed/test_succeed @@ -9,7 +9,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/flt.utils.trimmer/test_trimming b/tests/plugins/flt.utils.trimmer/test_trimming index f7ae8cec..f46fe31f 100755 --- a/tests/plugins/flt.utils.trimmer/test_trimming +++ b/tests/plugins/flt.utils.trimmer/test_trimming @@ -10,7 +10,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/sink.ctf.fs/succeed/test_succeed b/tests/plugins/sink.ctf.fs/succeed/test_succeed index ffca9bda..6d47c09e 100755 --- a/tests/plugins/sink.ctf.fs/succeed/test_succeed +++ b/tests/plugins/sink.ctf.fs/succeed/test_succeed @@ -13,7 +13,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/sink.ctf.fs/test_assume_single_trace b/tests/plugins/sink.ctf.fs/test_assume_single_trace index dd84e044..6af7aa05 100755 --- a/tests/plugins/sink.ctf.fs/test_assume_single_trace +++ b/tests/plugins/sink.ctf.fs/test_assume_single_trace @@ -9,7 +9,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/sink.ctf.fs/test_stream_names b/tests/plugins/sink.ctf.fs/test_stream_names index a60a1dbf..c071eb17 100755 --- a/tests/plugins/sink.ctf.fs/test_stream_names +++ b/tests/plugins/sink.ctf.fs/test_stream_names @@ -12,7 +12,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/sink.text.details/succeed/test_succeed b/tests/plugins/sink.text.details/succeed/test_succeed index 6250b46d..9c21155d 100755 --- a/tests/plugins/sink.text.details/succeed/test_succeed +++ b/tests/plugins/sink.text.details/succeed/test_succeed @@ -7,7 +7,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/sink.text.pretty/test_enum b/tests/plugins/sink.text.pretty/test_enum index b943efc0..723448b7 100755 --- a/tests/plugins/sink.text.pretty/test_enum +++ b/tests/plugins/sink.text.pretty/test_enum @@ -8,7 +8,7 @@ # not all covered by the main babeltrace tests with traces. SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/sink.text.pretty/test_pretty_python b/tests/plugins/sink.text.pretty/test_pretty_python index 3fdac62c..fe395e77 100755 --- a/tests/plugins/sink.text.pretty/test_pretty_python +++ b/tests/plugins/sink.text.pretty/test_pretty_python @@ -5,7 +5,7 @@ # Copyright (C) 2017 Philippe Proulx # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/fail/test_fail b/tests/plugins/src.ctf.fs/fail/test_fail index 652ec6f4..1c75a0d2 100755 --- a/tests/plugins/src.ctf.fs/fail/test_fail +++ b/tests/plugins/src.ctf.fs/fail/test_fail @@ -10,7 +10,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/query/test_query_metadata_info b/tests/plugins/src.ctf.fs/query/test_query_metadata_info index 9c2e4d0a..6db90091 100755 --- a/tests/plugins/src.ctf.fs/query/test_query_metadata_info +++ b/tests/plugins/src.ctf.fs/query/test_query_metadata_info @@ -8,7 +8,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/query/test_query_support_info b/tests/plugins/src.ctf.fs/query/test_query_support_info index f1d72cb3..51044628 100755 --- a/tests/plugins/src.ctf.fs/query/test_query_support_info +++ b/tests/plugins/src.ctf.fs/query/test_query_support_info @@ -5,7 +5,7 @@ # Copyright (C) 2019 Simon Marchi # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/query/test_query_trace_info b/tests/plugins/src.ctf.fs/query/test_query_trace_info index f7e3ce5e..49f316bb 100755 --- a/tests/plugins/src.ctf.fs/query/test_query_trace_info +++ b/tests/plugins/src.ctf.fs/query/test_query_trace_info @@ -5,7 +5,7 @@ # Copyright (C) 2019 Simon Marchi # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/succeed/test_succeed b/tests/plugins/src.ctf.fs/succeed/test_succeed index 16fac9ab..81d87593 100755 --- a/tests/plugins/src.ctf.fs/succeed/test_succeed +++ b/tests/plugins/src.ctf.fs/succeed/test_succeed @@ -13,7 +13,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.fs/test_deterministic_ordering b/tests/plugins/src.ctf.fs/test_deterministic_ordering index 02a76c20..9eb8b8f6 100755 --- a/tests/plugins/src.ctf.fs/test_deterministic_ordering +++ b/tests/plugins/src.ctf.fs/test_deterministic_ordering @@ -28,7 +28,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live index f5ba914b..e1766e15 100755 --- a/tests/plugins/src.ctf.lttng-live/test_live +++ b/tests/plugins/src.ctf.lttng-live/test_live @@ -13,7 +13,7 @@ SH_TAP=1 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../../utils/utils.sh" diff --git a/tests/python-plugin-provider/test_python_plugin_provider b/tests/python-plugin-provider/test_python_plugin_provider index 1e66c6ae..542c1748 100755 --- a/tests/python-plugin-provider/test_python_plugin_provider +++ b/tests/python-plugin-provider/test_python_plugin_provider @@ -5,7 +5,7 @@ # Copyright (C) 2017 Philippe Proulx # -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" diff --git a/tests/utils/env.sh.in b/tests/utils/env.sh.in index 96f4fc09..ab5b47e7 100644 --- a/tests/utils/env.sh.in +++ b/tests/utils/env.sh.in @@ -4,44 +4,44 @@ # ### Base paths to test suite ### -if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then +if [ -z "${BT_TESTS_SRCDIR:-}" ]; then BT_TESTS_SRCDIR="@abs_top_srcdir@/tests" fi export BT_TESTS_SRCDIR -if [ "x${BT_TESTS_BUILDDIR:-}" = "x" ]; then +if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then BT_TESTS_BUILDDIR="@abs_top_builddir@/tests" fi export BT_TESTS_BUILDDIR ### External Tools ### -if [ "x${BT_TESTS_AWK_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_AWK_BIN:-}" ]; then BT_TESTS_AWK_BIN="@AWK@" fi export BT_TESTS_AWK_BIN -if [ "x${BT_TESTS_GREP_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_GREP_BIN:-}" ]; then BT_TESTS_GREP_BIN="@GREP@" fi export BT_TESTS_GREP_BIN -if [ "x${BT_TESTS_PYTHON_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_PYTHON_BIN:-}" ]; then BT_TESTS_PYTHON_BIN="@PYTHON@" fi export BT_TESTS_PYTHON_BIN -if [ "x${BT_TESTS_PYTHON_CONFIG_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]; then BT_TESTS_PYTHON_CONFIG_BIN="@PYTHON_CONFIG@" fi export BT_TESTS_PYTHON_CONFIG_BIN -if [ "x${BT_TESTS_SED_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_SED_BIN:-}" ]; then BT_TESTS_SED_BIN="@SED@" fi export BT_TESTS_SED_BIN -if [ "x${BT_TESTS_CC_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_CC_BIN:-}" ]; then BT_TESTS_CC_BIN="@CC@" fi export BT_TESTS_CC_BIN @@ -49,7 +49,7 @@ export BT_TESTS_CC_BIN ### Optional features ### -if [ "x${BT_TESTS_ENABLE_ASAN:-}" = "x" ]; then +if [ -z "${BT_TESTS_ENABLE_ASAN:-}" ]; then BT_TESTS_ENABLE_ASAN="@ENABLE_ASAN@" fi export BT_TESTS_ENABLE_ASAN diff --git a/tests/utils/run_python_bt2 b/tests/utils/run_python_bt2 index fa5dd0cc..574900a2 100755 --- a/tests/utils/run_python_bt2 +++ b/tests/utils/run_python_bt2 @@ -14,7 +14,7 @@ # -t test_value.MapValueTestCase.test_deepcopy \ # ./tests/bindings/python/bt2 -if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then +if [ -n "${BT_TESTS_SRCDIR:-}" ]; then UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh" else UTILSSH="$(dirname "$0")/../utils/utils.sh" @@ -33,7 +33,7 @@ usage() { echo "the path to the built 'tests' directory." } -if [ "x$*" = "x" ]; then +if [ -z "$*" ]; then usage exit 1 fi diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index 3cbea160..6107a610 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -25,7 +25,7 @@ fi # We do a bit of translation to ease our life down the road for comparison. # Export it so that called executables can use it. # [1] https://en.wikipedia.org/wiki/Uname#Examples -if [ "x${BT_TESTS_OS_TYPE:-}" = "x" ]; then +if [ -z "${BT_TESTS_OS_TYPE:-}" ]; then BT_TESTS_OS_TYPE="$(uname -s)" case "$BT_TESTS_OS_TYPE" in MINGW*) @@ -48,12 +48,12 @@ fi export BT_TESTS_OS_TYPE # Allow overriding the source and build directories -if [ "x${BT_TESTS_SRCDIR:-}" = "x" ]; then +if [ -z "${BT_TESTS_SRCDIR:-}" ]; then BT_TESTS_SRCDIR="$testsdir" fi export BT_TESTS_SRCDIR -if [ "x${BT_TESTS_BUILDDIR:-}" = "x" ]; then +if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then BT_TESTS_BUILDDIR="$testsdir" fi export BT_TESTS_BUILDDIR @@ -66,7 +66,7 @@ if [ -f "${BT_TESTS_BUILDDIR}/utils/env.sh" ]; then fi # Allow overriding the babeltrace2 executables -if [ "x${BT_TESTS_BT2_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_BT2_BIN:-}" ]; then BT_TESTS_BT2_BIN="$BT_TESTS_BUILDDIR/../src/cli/babeltrace2" if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then BT_TESTS_BT2_BIN="${BT_TESTS_BT2_BIN}.exe" @@ -78,50 +78,50 @@ export BT_TESTS_BT2_BIN BT_PLUGINS_PATH="${BT_TESTS_BUILDDIR}/../src/plugins" # Allow overriding the babeltrace2 plugin path -if [ "x${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" = "x" ]; then +if [ -z "${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" ]; then BT_TESTS_BABELTRACE_PLUGIN_PATH="${BT_PLUGINS_PATH}/ctf:${BT_PLUGINS_PATH}/utils:${BT_PLUGINS_PATH}/text:${BT_PLUGINS_PATH}/lttng-utils" fi export BT_TESTS_BABELTRACE_PLUGIN_PATH -if [ "x${BT_TESTS_PROVIDER_DIR:-}" = "x" ]; then +if [ -z "${BT_TESTS_PROVIDER_DIR:-}" ]; then BT_TESTS_PROVIDER_DIR="${BT_TESTS_BUILDDIR}/../src/python-plugin-provider/.libs" fi export BT_TESTS_PROVIDER_DIR # Allow overriding the babeltrace2 executables -if [ "x${BT_TESTS_PYTHONPATH:-}" = "x" ]; then +if [ -z "${BT_TESTS_PYTHONPATH:-}" ]; then BT_TESTS_PYTHONPATH="${BT_TESTS_BUILDDIR}/../src/bindings/python/bt2/build/build_lib" fi export BT_TESTS_PYTHONPATH ### External Tools ### -if [ "x${BT_TESTS_AWK_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_AWK_BIN:-}" ]; then BT_TESTS_AWK_BIN="awk" fi export BT_TESTS_AWK_BIN -if [ "x${BT_TESTS_GREP_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_GREP_BIN:-}" ]; then BT_TESTS_GREP_BIN="grep" fi export BT_TESTS_GREP_BIN -if [ "x${BT_TESTS_PYTHON_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_PYTHON_BIN:-}" ]; then BT_TESTS_PYTHON_BIN="python3" fi export BT_TESTS_PYTHON_BIN -if [ "x${BT_TESTS_PYTHON_CONFIG_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]; then BT_TESTS_PYTHON_CONFIG_BIN="python3-config" fi export BT_TESTS_PYTHON_CONFIG_BIN -if [ "x${BT_TESTS_SED_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_SED_BIN:-}" ]; then BT_TESTS_SED_BIN="sed" fi export BT_TESTS_SED_BIN -if [ "x${BT_TESTS_CC_BIN:-}" = "x" ]; then +if [ -z "${BT_TESTS_CC_BIN:-}" ]; then BT_TESTS_CC_BIN="cc" fi export BT_TESTS_CC_BIN @@ -129,7 +129,7 @@ export BT_TESTS_CC_BIN ### Optional features ### -if [ "x${BT_TESTS_ENABLE_ASAN:-}" = "x" ]; then +if [ -z "${BT_TESTS_ENABLE_ASAN:-}" ]; then BT_TESTS_ENABLE_ASAN="0" fi export BT_TESTS_ENABLE_ASAN @@ -142,7 +142,7 @@ BT_CTF_TRACES_PATH="${BT_TESTS_DATADIR}/ctf-traces" # By default, it will not source tap.sh. If you want to output tap directly # from the test script, define the 'SH_TAP' variable to '1' before sourcing # this script. -if [ "x${SH_TAP:-}" = x1 ]; then +if [ "${SH_TAP:-}" = 1 ]; then # shellcheck source=./tap/tap.sh . "${BT_TESTS_SRCDIR}/utils/tap/tap.sh" fi @@ -343,7 +343,7 @@ run_python_bt2() { # leaks, so we must unfortunately disable leak detection. Append it to # existing ASAN_OPTIONS, such that we override the user's value if it # contains detect_leaks=1. - if [ "x${BT_TESTS_ENABLE_ASAN:-}" = "x1" ]; then + if [ "${BT_TESTS_ENABLE_ASAN:-}" = "1" ]; then lib_asan=$(${BT_TESTS_CC_BIN} -print-file-name=libasan.so) env_args+=("LD_PRELOAD=${lib_asan}:${LD_PRELOAD:-}") @@ -365,11 +365,11 @@ run_python_bt2_test() { local test_runner_args=() test_runner_args+=("$test_dir") - if [ "x${test_pattern}" != "x" ]; then + if [ -n "${test_pattern}" ]; then test_runner_args+=("${test_pattern}") fi - if test "x${BT_TESTS_COVERAGE:-}" = "x1"; then + if test "${BT_TESTS_COVERAGE:-}" = "1"; then python_exec="check_coverage" else python_exec="${BT_TESTS_PYTHON_BIN}" @@ -383,11 +383,11 @@ run_python_bt2_test() { ret=$? - if test "x${BT_TESTS_COVERAGE_REPORT:-}" = "x1"; then + if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then coverage report -m fi - if test "x${BT_TESTS_COVERAGE_HTML:-}" = "x1"; then + if test "${BT_TESTS_COVERAGE_HTML:-}" = "1"; then coverage html fi -- 2.34.1