Cleanup: tests: use find's `-name` option instead of grep

[lttng-tools.git] / tests / regression / tools / metadata / test_ust

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index 529b0a21153265198a7043e7643217c54acafbbe..ba34b7f4c4834c79916551152611cfd9ced969b1 100755 (executable)
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library 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 Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="Metadata env - User space tracing"
 
 CURDIR=$(dirname "$0")/
@@ -58,7 +48,7 @@ function test_per_uid ()
        enable_ust_lttng_event_ok "$session_name" $EVENT_NAME
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN $NR_ITER
+       $TESTAPP_BIN -i $NR_ITER
 
        stop_lttng_tracing_ok "$session_name"
        destroy_lttng_session_ok "$session_name"
@@ -66,7 +56,7 @@ function test_per_uid ()
        # bt1 accepts only a directory while bt2 accepts either the metadata
        # file directly or a directory with an immediate metadata file.
        # Settle for the common denominator.
-       metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+       metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
        $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
@@ -150,7 +140,7 @@ function test_per_pid ()
        enable_ust_lttng_event_ok "$session_name" $EVENT_NAME channel
        start_lttng_tracing_ok "$session_name"
 
-       $TESTAPP_BIN "$NR_ITER" "$NR_USEC_WAIT" &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT &
        testapp_pid=$!
        wait $testapp_pid
 
@@ -160,7 +150,7 @@ function test_per_pid ()
        # bt1 accepts only a directory while bt2 accepts either the metadata
        # file directly or a directory with an immediate metadata file.
        # Settle for the common denominator.
-       metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+       metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
        $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" 1> "$metadata"