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 517b076c957c72b6f53d7139c18d0c993dde3253..cd7aab242f909bdb43eb96aebec443c892b982d9 100755 (executable)
--- a/tests/cli/convert/test_convert_args
+++ b/tests/cli/convert/test_convert_args
@@ -1,23 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
+# Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
 #
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 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"
@@ -80,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.