X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=56c23ff408a98b4704a0a4ff1743a66983673ad5;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=7937fa27dd3a9e22e253404df6ec462768670eda;hpb=5fcaccbce7683a6af772d6f37d03fb01cf248a84;p=lttng-tools.git diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush index 7937fa27d..56c23ff40 100755 --- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush +++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush @@ -1,19 +1,9 @@ #!/bin/bash # -# Copyright (C) - 2012 David Goulet +# Copyright (C) 2012 David Goulet # -# 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 tracer - Tracing with per UID buffers and periodical flush" CURDIR=$(dirname $0)/ @@ -27,7 +17,7 @@ SESSION_NAME="periodical-flush" EVENT_NAME="tp:tptest" BIN_NAME="gen-nevents" NUM_TESTS=38 -APP_TMP_FILE=$(mktemp -u) +APP_TMP_FILE=$(mktemp -u -t tmp.test_periodical_metadata_flush_ust_app_tmp_file.XXXXXX) APPS_PID= source $TESTDIR/utils/utils.sh @@ -78,7 +68,7 @@ function validate_trace() { local out - out=$(babeltrace $TRACE_PATH | grep $EVENT_NAME | wc -l) + out=$("$BABELTRACE_BIN" $TRACE_PATH | grep $EVENT_NAME | wc -l) if [ $out -eq 0 ]; then fail "Trace validation" diag "No event(s) found. We are supposed to have at least one." @@ -106,7 +96,7 @@ function check_app_tmp_file() function start_trace_app() { # Start application with a temporary file. - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $APP_TMP_FILE & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $APP_TMP_FILE & ret=$? APPS_PID="${APPS_PID} ${!}" ok $ret "Start application to trace" @@ -134,11 +124,11 @@ test_after_app_pid() { diag "Start application AFTER tracing is started" - create_lttng_session $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_metadata_per_pid $SESSION_NAME enable_channel_per_pid $SESSION_NAME "channel0" - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" + start_lttng_tracing_ok $SESSION_NAME # Start application after tracing start_check_trace_app @@ -161,8 +151,8 @@ test_after_app_pid() { kill -s SIGKILL ${p} wait ${p} 2>/dev/null done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME wait_trace_apps @@ -180,11 +170,11 @@ test_before_app_pid() { start_trace_app # Start application before tracing - create_lttng_session $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_metadata_per_pid $SESSION_NAME enable_channel_per_pid $SESSION_NAME "channel0" - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" + start_lttng_tracing_ok $SESSION_NAME check_app_tmp_file # Let the application at least perform a flush! @@ -208,8 +198,8 @@ test_before_app_pid() { wait ${p} 2>/dev/null done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME wait_trace_apps @@ -223,11 +213,11 @@ test_after_app_uid() { diag "Start application AFTER tracing is started" - create_lttng_session $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_metadata_per_uid $SESSION_NAME enable_channel_per_uid $SESSION_NAME "channel0" - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" + start_lttng_tracing_ok $SESSION_NAME # Start application after tracing start_check_trace_app @@ -251,8 +241,8 @@ test_after_app_uid() { kill -s SIGKILL ${p} wait ${p} 2>/dev/null done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME wait_trace_apps @@ -269,11 +259,11 @@ test_before_app_uid() { # Start application before tracing start_trace_app - create_lttng_session $SESSION_NAME $TRACE_PATH + create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_metadata_per_uid $SESSION_NAME enable_channel_per_uid $SESSION_NAME "channel0" - enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0" - start_lttng_tracing $SESSION_NAME + enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" + start_lttng_tracing_ok $SESSION_NAME check_app_tmp_file # Let the application at least perform a flush! @@ -296,8 +286,8 @@ test_before_app_uid() { kill -s SIGKILL ${p} wait ${p} 2>/dev/null done - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME wait_trace_apps @@ -308,6 +298,7 @@ test_before_app_uid() { plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +bail_out_if_no_babeltrace TESTS=( "test_before_app_uid" @@ -322,7 +313,7 @@ i=0 start_lttng_sessiond while [ $i -lt $TEST_COUNT ]; do - TRACE_PATH=$(mktemp -d) + TRACE_PATH=$(mktemp -d -t tmp.test_periodical_metadata_flush_ust_trace_path.XXXXXX) ${TESTS[$i]} rm -rf $TRACE_PATH let "i++"