run-in-py-utils-bt2-env.sh: use the arg. count io. checking a string

[babeltrace.git] / tests / utils / run-in-py-env.sh

diff --git a/tests/utils/run-in-py-env.sh b/tests/utils/run-in-py-env.sh
index 6f197d734da8a96e3a0dcf9810c886e2b130a2f0..10b590e25bfd907b2abb81b256df9a291319ceb5 100755 (executable)
--- a/tests/utils/run-in-py-env.sh
+++ b/tests/utils/run-in-py-env.sh
@@ -5,7 +5,7 @@
 # Copyright (C) 2017-2023 Philippe Proulx <pproulx@efficios.com>
 # Copyright (C) 2019 Simon Marchi <simon.marchi@efficios.com>
 
-if [ -n "${BT_TESTS_SRCDIR:-}" ]; then
+if [[ -n "${BT_TESTS_SRCDIR:-}" ]]; then
        UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh"
 else
        UTILSSH="$(dirname "$0")/../utils/utils.sh"
@@ -25,18 +25,21 @@ usage() {
        echo "environment variable to the built \`tests\` directory."
 }
 
-if [ -z "$*" ]; then
+if (($# == 0)); then
        usage
        exit 1
 fi
 
 # Sanity check that the BT_TESTS_BUILDDIR value makes sense.
-if [ ! -f "$BT_TESTS_BUILDDIR/Makefile" ]; then
-       fold -w 80 -s <<- END
-       $0: BT_TESTS_BUILDDIR does not point to a valid directory (\`$BT_TESTS_BUILDDIR/Makefile\` does not exist).
+if [[ ! -f "$BT_TESTS_BUILDDIR/Makefile" ]]; then
+       {
+               echo "ERROR: Invalid \`BT_TESTS_BUILDDIR\` variable (\`\$BT_TESTS_BUILDDIR/Makefile\`"
+               echo "doesn't exist)."
+               echo ""
+               echo "If you build out of tree, export and set the \`BT_TESTS_BUILDDIR\` environment"
+               echo "variable to the built \`tests\` directory."
+       } >&2
 
-       If building out-of-tree, set BT_TESTS_BUILDDIR to point to the \`tests\` directory in the build tree.
-       END
        exit 1
 fi