X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fclock-override%2Ftest_clock_override;h=c7157720ecc7a8576ebba851eb6515e6cd8c40df;hb=HEAD;hp=d63ec8bcb573d1695fb0f3faaec3bd264133b4a6;hpb=3d2deeadbdbcc9ef645701da46172de93d2ed45b;p=lttng-tools.git diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override index d63ec8bcb..c7157720e 100755 --- a/tests/regression/ust/clock-override/test_clock_override +++ b/tests/regression/ust/clock-override/test_clock_override @@ -1,19 +1,9 @@ #!/bin/bash # -# Copyright (C) - 2015 Jonathan Rajotte +# Copyright (C) 2015 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="UST - Clock override plugin" CURDIR=$(dirname $0)/ @@ -52,7 +42,7 @@ source $TESTDIR/utils/utils.sh # MUST set TESTDIR before calling those functions function run_app() { - $TESTAPP_BIN $NUM_EVENT + $TESTAPP_BIN -i $NUM_EVENT ok $? "Application done" } @@ -76,8 +66,8 @@ function extract_clock_metadata_token() function test_getcpu_override_metadata() { - local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX) - local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX) + local ctf_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t ctf-metadata.XXXXXX) + local clock_metadata_file=$(TMPDIR="$TRACE_PATH" mktemp -t clock-metadata.XXXXXX) local result="" diag "Clock override plugin metadata test" @@ -184,7 +174,7 @@ i=0 while [ "$i" -lt "$TEST_COUNT" ]; do - TRACE_PATH=$(mktemp -d) + TRACE_PATH=$(mktemp -d -t tmp.test_clock_override_ust_trace_path.XXXXXX) # Execute test ${TESTS[$i]}