X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fbuffers-pid%2Ftest_buffers_pid;h=982ee2d58dff73a25f7c0f4a41589634b317d601;hp=d21e8c34ad6f256bc8c927a97aa80442917ad862;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023 diff --git a/tests/regression/ust/buffers-pid/test_buffers_pid b/tests/regression/ust/buffers-pid/test_buffers_pid index d21e8c34a..982ee2d58 100755 --- a/tests/regression/ust/buffers-pid/test_buffers_pid +++ b/tests/regression/ust/buffers-pid/test_buffers_pid @@ -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 PID buffers" CURDIR=$(dirname $0)/ @@ -58,13 +48,13 @@ test_after_multiple_apps() { start_lttng_tracing_ok $SESSION_NAME for i in `seq 1 5`; do - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT >/dev/null 2>&1 & ok $? "Start application $i for tracing" done wait - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH @@ -74,13 +64,15 @@ test_after_multiple_apps() { test_before_multiple_apps() { local out local i - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") diag "Start multiple applications BEFORE tracing is started" for i in `seq 1 5`; do - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first}_${i} ${file_sync_before_last}_${i} >/dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first}_${i} \ + --sync-before-last-event ${file_sync_before_last}_${i} >/dev/null 2>&1 & ok $? "Start application $i for tracing" done @@ -98,15 +90,15 @@ test_before_multiple_apps() { wait pass "Waiting done" - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME for i in `seq 1 5`; do rm -f ${file_sync_after_first}_${i} rm -f ${file_sync_before_last}_${i} done - 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." @@ -131,12 +123,12 @@ test_after_app() { enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" start_lttng_tracing_ok $SESSION_NAME - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT & ok $? "Start application to trace" wait - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH @@ -145,8 +137,8 @@ test_after_app() { test_before_app() { local out - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") diag "Start application BEFORE tracing is started" @@ -156,7 +148,9 @@ test_before_app() { enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first} \ + --sync-before-last-event ${file_sync_before_last} & ok $? "Start application to trace" start_lttng_tracing_ok $SESSION_NAME @@ -165,13 +159,13 @@ test_before_app() { wait - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME rm -f ${file_sync_after_first} rm -f ${file_sync_before_last} - 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." @@ -210,15 +204,15 @@ test_multiple_channels() { ok $? "Enable event $EVENT_NAME for session $SESSION_NAME in channel4" start_lttng_tracing_ok $SESSION_NAME - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT & ok $? "Start application to trace" wait - stop_lttng_tracing $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME trace_match_only $EVENT_NAME $[NR_ITER * 5] $TRACE_PATH out=$? - destroy_lttng_session $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME return $out } @@ -228,6 +222,8 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +bail_out_if_no_babeltrace + TESTS=( "test_before_app" "test_after_app" @@ -242,7 +238,7 @@ i=0 start_lttng_sessiond while [ $i -lt $TEST_COUNT ]; do - TRACE_PATH=$(mktemp -d) + TRACE_PATH=$(mktemp --tmpdir -d tmp.test_buffers_pid_trace_path.XXXXXX) ${TESTS[$i]} rm -rf $TRACE_PATH let "i++"