tests: use -z / -n to test for string empty / non-empty

[babeltrace.git] / tests / cli / convert / test_convert_args

diff --git a/tests/cli/convert/test_convert_args b/tests/cli/convert/test_convert_args
index 12e41bd04b89721a1b0d176a23fa01eb9f2ef9a7..cd7aab242f909bdb43eb96aebec443c892b982d9 100755 (executable)
--- 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"
@@ -70,7 +70,7 @@ path_to_trace="${BT_CTF_TRACES_PATH}/succeed/succeed1"
 path_to_trace2="${BT_CTF_TRACES_PATH}/succeed/succeed2"
 output_path="/output/path"
 
-if [ "$BT_OS_TYPE" = "mingw" ]; then
+if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
        # Use Windows native paths for comparison because Unix
        # paths are converted by the shell before they are passed
        # to the native babeltrace2 binary.