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

[babeltrace.git] / tests / plugins / sink.ctf.fs / test_stream_names

diff --git a/tests/plugins/sink.ctf.fs/test_stream_names b/tests/plugins/sink.ctf.fs/test_stream_names
index 03ed4174ce471691f625593e29bc26772ceb4002..c071eb173c71d4e42eb074e5a1a35f58152a9f39 100755 (executable)
--- a/tests/plugins/sink.ctf.fs/test_stream_names
+++ b/tests/plugins/sink.ctf.fs/test_stream_names
@@ -12,7 +12,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,7 +39,7 @@ bt_cli "$temp_stdout" "$temp_stderr" \
 ok "$?" "run babeltrace"
 
 # Check stdout.
-if [ "$BT_OS_TYPE" = "mingw" ]; then
+if [ "$BT_TESTS_OS_TYPE" = "mingw" ]; then
        echo "Created CTF trace \`$(cygpath -m ${temp_output_dir})\\trace\`." > "$temp_expected_stdout"
 else
        echo "Created CTF trace \`${trace_dir}\`." > "$temp_expected_stdout"