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

[babeltrace.git] / tests / cli / test_output_path_ctf_non_lttng_trace

diff --git a/tests/cli/test_output_path_ctf_non_lttng_trace b/tests/cli/test_output_path_ctf_non_lttng_trace
index a18644c5406ac384b1d851d619b0d31fe36815aa..fc0158bfc777dd4453e8537f9a978291c2dd0ceb 100755 (executable)
--- a/tests/cli/test_output_path_ctf_non_lttng_trace
+++ b/tests/cli/test_output_path_ctf_non_lttng_trace
@@ -1,20 +1,9 @@
 #!/bin/bash
-
-# Copyright (C) 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) 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.
 
 # This test verifies that generic (non-LTTng) CTF traces are output with the
 # expected directory structure.
@@ -28,7 +17,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"
@@ -39,8 +28,8 @@ source "$UTILSSH"
 
 plan_tests 3
 
-temp_input_dir=$(mktemp -d)
-temp_output_dir=$(mktemp -d)
+temp_input_dir=$(mktemp -t -d test_output_path_ctf_non_lttng_trace_input.XXXXXX)
+temp_output_dir=$(mktemp -t -d test_output_path_ctf_non_lttng_trace_output.XXXXXX)
 
 mkdir -p "${temp_input_dir}/a/b/c"
 cp -a "${BT_CTF_TRACES_PATH}/intersection/3eventsintersect" "${temp_input_dir}/a/b/c"
@@ -51,7 +40,7 @@ cp -a "${BT_CTF_TRACES_PATH}/intersection/3eventsintersectreverse" "${temp_input
 mkdir -p "${temp_input_dir}/d/e/f"
 cp -a "${BT_CTF_TRACES_PATH}/intersection/nointersect" "${temp_input_dir}/d/e/f"
 
-"${BT_TESTS_BT2_BIN}" "${temp_input_dir}" -c sink.ctf.fs -p "path=\"${temp_output_dir}\""
+bt_cli "/dev/null" "/dev/null" "${temp_input_dir}" -c sink.ctf.fs -p "path=\"${temp_output_dir}\""
 
 test -f "${temp_output_dir}/a/b/c/3eventsintersect/metadata"
 ok "$?" "3eventsintersect output trace exists"