X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Fust%2Fclock-override%2Ftest_clock_override;h=be91df234432fbc8e4b82923302727ca050818e1;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=722e7315849f6763893a46215f931d736582d18b;hpb=f37e092d5360510f2975ea5bd0ae69084ae17691;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 722e73158..be91df234 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 <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2015 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="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.XXXXX)
-	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX)
+	local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
+	local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
 	local result=""
 
 	diag "Clock override plugin metadata test"
@@ -95,7 +85,10 @@ function test_getcpu_override_metadata()
 	destroy_lttng_session_ok $SESSION_NAME
 	stop_lttng_sessiond
 
-	$BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_PATH
+	local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
+	local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
+
+	$BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_METADATA_DIR
 	ok $? "Metadata extraction from babeltrace"
 
 	extract_clock_metadata $ctf_metadata_file $clock_metadata_file