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

[babeltrace.git] / tests / plugins / flt.lttng-utils.debug-info / test_dwarf_x86_64-linux-gnu

diff --git a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu
index ef5416fda3f5d6789f4cc87c8d262585e09939a7..8a7a3ebbfa6e2ffeb64c69efc18785f13000e683 100755 (executable)
--- a/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu
+++ b/tests/plugins/flt.lttng-utils.debug-info/test_dwarf_x86_64-linux-gnu
@@ -1,24 +1,12 @@
 #!/bin/bash
 #
+# SPDX-License-Identifier: GPL-2.0-only
+#
 # Copyright (C) 2015 Antoine Busque <abusque@efficios.com>
 # Copyright (C) 2019 Michael Jeanson <mjeanson@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.
-#
-# 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.
-#
-# 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.
-#
 
-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"
@@ -27,4 +15,9 @@ fi
 # shellcheck source=../../utils/utils.sh
 source "$UTILSSH"
 
-"${BT_TESTS_BUILDDIR}/plugins/flt.lttng-utils.debug-info/test_dwarf" "${BT_DEBUG_INFO_PATH}/x86_64-linux-gnu"
+this_dir_relative="plugins/flt.lttng-utils.debug-info"
+this_dir_build="$BT_TESTS_BUILDDIR/$this_dir_relative"
+debug_info_data="$BT_TESTS_DATADIR/$this_dir_relative/x86_64-linux-gnu"
+
+"$this_dir_build/test_dwarf" \
+       "$debug_info_data/"