Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / ust / clock-override / test_clock_override

diff --git a/tests/regression/ust/clock-override/test_clock_override b/tests/regression/ust/clock-override/test_clock_override
index 722e7315849f6763893a46215f931d736582d18b..ce5d9687a0a259fc1a40db201df0b08aa43d9fb9 100755 (executable)
--- a/tests/regression/ust/clock-override/test_clock_override
+++ b/tests/regression/ust/clock-override/test_clock_override
@@ -52,7 +52,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 +76,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 +95,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