X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_ust;h=ba34b7f4c4834c79916551152611cfd9ced969b1;hb=fc2dd19e2c7dbeaa86654b47c0a2c221b7018ecf;hp=72d9b19b185e2c8446636574fe642c3a4a61d70e;hpb=6c4a91d639747f260ab46decebc50998ef063712;p=lttng-tools.git diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust index 72d9b19b1..ba34b7f4c 100755 --- 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 +# Copyright (C) 2019 Jonathan Rajotte # -# 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")/ @@ -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" @@ -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"