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

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

diff --git a/tests/cli/convert/test_auto_source_discovery_grouping b/tests/cli/convert/test_auto_source_discovery_grouping
index 85f324d843a0b274930c01396598351ca67ae801..e476c96cb435a6448575c444c9b28d37c48df25b 100755 (executable)
--- a/tests/cli/convert/test_auto_source_discovery_grouping
+++ b/tests/cli/convert/test_auto_source_discovery_grouping
@@ -1,23 +1,13 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 Simon Marchi <simon.marchi@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) 2019 Simon Marchi <simon.marchi@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.
 
 # Test the auto source disovery mechanism of the CLI.
 
-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"
@@ -30,26 +20,16 @@ NUM_TESTS=3
 
 plan_tests $NUM_TESTS
 
-data_dir="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping"
+data_dir="${BT_TESTS_DATADIR}/auto-source-discovery/grouping"
 plugin_dir="${data_dir}"
 trace_dir="${data_dir}/traces"
 
-if [ "$BT_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.
-       trace_dir=$(cygpath -w "$trace_dir")
-       dir_sep='\'
-else
-       dir_sep='/'
-fi
-
-stdout_expected_file="${data_dir}/stdout.expect"
+stdout_expected_file="${BT_TESTS_DATADIR}/cli/convert/auto-source-discovery-grouping.expect"
 stdout_actual_file=$(mktemp -t stdout-actual.XXXXXX)
 stderr_actual_file=$(mktemp -t actual-stderr.XXXXXX)
 
 bt_cli "$stdout_actual_file" "$stderr_actual_file" \
-       convert --plugin-path "${plugin_dir}" "ABCDE" "${trace_dir}" some_other_non_opt \
+       --plugin-path "${plugin_dir}" convert "ABCDE" "${trace_dir}" some_other_non_opt \
        -c sink.text.details --params='with-metadata=false'
 ok "$?" "CLI runs successfully"
 
@@ -58,6 +38,7 @@ bt_diff "$stdout_expected_file" "$stdout_actual_file"
 ok "$?" "expected components are instantiated with expected inputs"
 
 # Check that expected warning is printed.
+# shellcheck disable=SC2016
 grep -q 'No trace was found based on input `some_other_non_opt`' "$stderr_actual_file"
 ok "$?" "warning is printed"