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

[babeltrace.git] / tests / plugins / src.ctf.fs / test_deterministic_ordering

diff --git a/tests/plugins/src.ctf.fs/test_deterministic_ordering b/tests/plugins/src.ctf.fs/test_deterministic_ordering
index 27d317ecbfb1398398377e5ca6aa206d2266c56d..9eb8b8f64b6994408d41bb2a4356c442a9e87d74 100755 (executable)
--- a/tests/plugins/src.ctf.fs/test_deterministic_ordering
+++ b/tests/plugins/src.ctf.fs/test_deterministic_ordering
@@ -1,20 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 Efficios, Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
+# 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) 2019 Efficios, Inc.
 #
-# 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 # Test the deterministic behavior of the src.ctf.fs component versus the
 # ordering of the given input paths.
@@ -39,13 +28,13 @@
 
 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"
 fi
 
-# shellcheck source=../../../utils/utils.sh
+# shellcheck source=../../utils/utils.sh
 source "$UTILSSH"
 
 traces_dir="${BT_CTF_TRACES_PATH}/deterministic-ordering"
@@ -53,7 +42,7 @@ trace_a_corrupted="${traces_dir}/a-corrupted"
 trace_b_not_corrupted="${traces_dir}/b-not-corrupted"
 trace_c_corrupted="${traces_dir}/c-corrupted"
 
-if [ "$BT_OS_TYPE" = "mingw" ]; then
+if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
        # The MSYS2 shell makes a mess trying to convert the Unix-like paths
        # to Windows-like paths, so just disable the automatic conversion and
        # do it by hand.