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

[babeltrace.git] / tests / plugins / sink.ctf.fs / succeed / test_succeed

diff --git a/tests/plugins/sink.ctf.fs/succeed/test_succeed b/tests/plugins/sink.ctf.fs/succeed/test_succeed
index 5c2547d6afaf0e35e703e759d992751d6af2df94..6d47c09e2a6e18a35b79cd30c80bafc4c910e99c 100755 (executable)
--- a/tests/plugins/sink.ctf.fs/succeed/test_succeed
+++ b/tests/plugins/sink.ctf.fs/succeed/test_succeed
@@ -1,20 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 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
-# 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 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 # This test validates that a `src.ctf.fs` component successfully reads
 # specific CTF traces and creates the expected messages.
@@ -24,7 +13,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"
@@ -41,7 +30,9 @@ succeed_traces="$BT_CTF_TRACES_PATH/succeed"
 test_ctf_single() {
        local name="$1"
        local in_trace_dir="$2"
-       local temp_out_trace_dir="$(mktemp -d)"
+       local temp_out_trace_dir
+
+       temp_out_trace_dir="$(mktemp -d)"
 
        diag "Converting trace '$name' to CTF through 'sink.ctf.fs'"
        "$BT_TESTS_BT2_BIN" >/dev/null "$in_trace_dir" -o ctf -w "$temp_out_trace_dir"
@@ -70,7 +61,9 @@ test_ctf_existing_single() {
 
 test_ctf_gen_single() {
        local name="$1"
-       local temp_gen_trace_dir="$(mktemp -d)"
+       local temp_gen_trace_dir
+
+       temp_gen_trace_dir="$(mktemp -d)"
 
        diag "Generating trace '$name'"