tests/utils/utils.sh: use `[[ ... ]]` instead of `[` or `test`

Even if `[` and `test` are Bash built-ins for POSIX shell backward
compatibility, `[[` has more features, and since we're using it at least
at once place, it makes sense to always use it in my opinion.

Also use `==` instead of `=`, the latter only existing for POSIX shell
backward compatibility, the former being like pretty much all the other
programming languages we use.

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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 2276734392f0cac6a8cb366968a5ec5d66278cfd..45439ac3893f581314957a125d54c694b0ee18d9 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -40,7 +40,7 @@ set -u
 #
 # Do some translation to ease our life down the road for comparison.
 # Export it so that executed commands can use it.
-if [ -z "${BT_TESTS_OS_TYPE:-}" ]; then
+if [[ -z "${BT_TESTS_OS_TYPE:-}" ]]; then
        BT_TESTS_OS_TYPE="$(uname -s)"
        case "$BT_TESTS_OS_TYPE" in
        MINGW*)
@@ -80,13 +80,13 @@ _set_vars_srcdir_builddir() {
        fi
 
        # Base source directory of tests
-       if [ -z "${BT_TESTS_SRCDIR:-}" ]; then
+       if [[ -z "${BT_TESTS_SRCDIR:-}" ]]; then
                BT_TESTS_SRCDIR="$testsdir"
        fi
        export BT_TESTS_SRCDIR
 
        # Base build directory of tests
-       if [ -z "${BT_TESTS_BUILDDIR:-}" ]; then
+       if [[ -z "${BT_TESTS_BUILDDIR:-}" ]]; then
                BT_TESTS_BUILDDIR="$testsdir"
        fi
        export BT_TESTS_BUILDDIR
@@ -99,7 +99,7 @@ unset -f _set_vars_srcdir_builddir
 _source_env_sh() {
        local -r env_sh_path="$BT_TESTS_BUILDDIR/utils/env.sh"
 
-       if [ -f "${env_sh_path}" ]; then
+       if [[ -f "${env_sh_path}" ]]; then
                # shellcheck disable=SC1090,SC1091
                . "${env_sh_path}"
        fi
@@ -109,9 +109,9 @@ _source_env_sh
 unset -f _source_env_sh
 
 # Path to the `babeltrace2` command, if not set
-if [ -z "${BT_TESTS_BT2_BIN:-}" ]; 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
+       if [[ "$BT_TESTS_OS_TYPE" == "mingw" ]]; then
                BT_TESTS_BT2_BIN+=".exe"
        fi
 fi
@@ -124,37 +124,37 @@ export BT_TESTS_BT2_BIN
 _bt_tests_plugins_path="${BT_TESTS_BUILDDIR}/../src/plugins"
 
 # Colon-separated list of project plugin paths, if not set
-if [ -z "${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" ]; then
+if [[ -z "${BT_TESTS_BABELTRACE_PLUGIN_PATH:-}" ]]; then
        BT_TESTS_BABELTRACE_PLUGIN_PATH="${_bt_tests_plugins_path}/ctf:${_bt_tests_plugins_path}/utils:${_bt_tests_plugins_path}/text:${_bt_tests_plugins_path}/lttng-utils"
 fi
 export BT_TESTS_BABELTRACE_PLUGIN_PATH
 
 # Directory containing the Python plugin provider library, if not set
-if [ -z "${BT_TESTS_PROVIDER_DIR:-}" ]; 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
 
 # Directory containing the built `bt2` Python package, if not set
-if [ -z "${BT_TESTS_PYTHONPATH:-}" ]; 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
 
 # Name of the `awk` command to use when testing, if not set
-if [ -z "${BT_TESTS_AWK_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_AWK_BIN:-}" ]]; then
        BT_TESTS_AWK_BIN="awk"
 fi
 export BT_TESTS_AWK_BIN
 
 # Name of the `grep` command to use when testing, if not set
-if [ -z "${BT_TESTS_GREP_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_GREP_BIN:-}" ]]; then
        BT_TESTS_GREP_BIN="grep"
 fi
 export BT_TESTS_GREP_BIN
 
 # Name of the `python3` command to use when testing, if not set
-if [ -z "${BT_TESTS_PYTHON_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_PYTHON_BIN:-}" ]]; then
        BT_TESTS_PYTHON_BIN="python3"
 fi
 export BT_TESTS_PYTHON_BIN
@@ -166,19 +166,19 @@ export BT_TESTS_PYTHON_BIN
 _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
-if [ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_PYTHON_CONFIG_BIN:-}" ]]; then
        BT_TESTS_PYTHON_CONFIG_BIN="python3-config"
 fi
 export BT_TESTS_PYTHON_CONFIG_BIN
 
 # Name of the `sed` command to use when testing, if not set
-if [ -z "${BT_TESTS_SED_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_SED_BIN:-}" ]]; then
        BT_TESTS_SED_BIN="sed"
 fi
 export BT_TESTS_SED_BIN
 
 # Name of the `cc` command to use when testing, if not set
-if [ -z "${BT_TESTS_CC_BIN:-}" ]; then
+if [[ -z "${BT_TESTS_CC_BIN:-}" ]]; then
        BT_TESTS_CC_BIN="cc"
 fi
 export BT_TESTS_CC_BIN
@@ -187,7 +187,7 @@ export BT_TESTS_CC_BIN
 #
 # This doesn't need to be exported from the point of view of this file,
 # but the sourced `env.sh` above does export it.
-if [ -z "${BT_TESTS_ENABLE_ASAN:-}" ]; then
+if [[ -z "${BT_TESTS_ENABLE_ASAN:-}" ]]; then
        BT_TESTS_ENABLE_ASAN="0"
 fi
 
@@ -198,7 +198,7 @@ BT_TESTS_DATADIR="${BT_TESTS_SRCDIR}/data"
 BT_CTF_TRACES_PATH="${BT_TESTS_DATADIR}/ctf-traces"
 
 # Source the shell TAP utilities if `SH_TAP` is `1`
-if [ "${SH_TAP:-}" = 1 ]; then
+if [[ "${SH_TAP:-}" == 1 ]]; then
        # shellcheck source=./tap/tap.sh
        . "${BT_TESTS_SRCDIR}/utils/tap/tap.sh"
 fi
@@ -407,9 +407,9 @@ run_python_bt2() {
 
        # Set the library search path so that the Python 3 interpreter can
        # load `libbabeltrace2`.
-       if [ "$BT_TESTS_OS_TYPE" = "mingw" ] || [ "$BT_TESTS_OS_TYPE" = "cygwin" ]; then
+       if [[ "$BT_TESTS_OS_TYPE" == "mingw" || "$BT_TESTS_OS_TYPE" == "cygwin" ]]; then
                local -x PATH="${main_lib_path}${PATH:+:}${PATH:-}"
-       elif [ "$BT_TESTS_OS_TYPE" = "darwin" ]; then
+       elif [[ "$BT_TESTS_OS_TYPE" == "darwin" ]]; then
                local -x DYLD_LIBRARY_PATH="${main_lib_path}${DYLD_LIBRARY_PATH:+:}${DYLD_LIBRARY_PATH:-}"
        else
                local -x LD_LIBRARY_PATH="${main_lib_path}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
@@ -418,7 +418,7 @@ run_python_bt2() {
        # On Windows, an embedded Python 3 interpreter needs a way to locate
        # the path to its internal modules: set the `PYTHONHOME` variable to
        # the prefix from `python3-config`.
-       if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
+       if [[ "$BT_TESTS_OS_TYPE" == "mingw" ]]; then
                local -x PYTHONHOME
 
                PYTHONHOME=$("$BT_TESTS_PYTHON_CONFIG_BIN" --prefix)
@@ -432,7 +432,7 @@ run_python_bt2() {
        #
        # Append it to existing `ASAN_OPTIONS` variable, such that we
        # override the user's value if it contains `detect_leaks=1`.
-       if [ "${BT_TESTS_ENABLE_ASAN:-}" = "1" ]; then
+       if [[ "${BT_TESTS_ENABLE_ASAN:-}" == "1" ]]; then
                if "${BT_TESTS_CC_BIN}" --version | head -n 1 | bt_grep -q '^gcc'; then
                        local -r lib_asan="$("${BT_TESTS_CC_BIN}" -print-file-name=libasan.so)"
                        local -x LD_PRELOAD="${lib_asan}${LD_PRELOAD:+:}${LD_PRELOAD:-}"
@@ -456,7 +456,7 @@ run_python_bt2_test() {
 
        local python_exec
 
-       if test "${BT_TESTS_COVERAGE:-}" = "1"; then
+       if [[ "${BT_TESTS_COVERAGE:-}" == "1" ]]; then
                python_exec="_bt_tests_check_coverage"
        else
                python_exec="${BT_TESTS_PYTHON_BIN}"
@@ -470,11 +470,11 @@ run_python_bt2_test() {
 
        local -r ret=$?
 
-       if test "${BT_TESTS_COVERAGE_REPORT:-}" = "1"; then
+       if [[ "${BT_TESTS_COVERAGE_REPORT:-}" == "1" ]]; then
                coverage report -m
        fi
 
-       if test "${BT_TESTS_COVERAGE_HTML:-}" = "1"; then
+       if [[ "${BT_TESTS_COVERAGE_HTML:-}" == "1" ]]; then
                coverage html
        fi