X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frelayd-grouping%2Ftest_ust;h=64fb90e348d25203816f0e90cd506e5d5dbfbea9;hb=208e4eea6509113477abee7e161ca63916bd6d73;hp=6c7eb98e59ebd8149ed3d2703cbc9fc19620585e;hpb=a9115ebf4fb48f4a0e81a97384c9ace7df219926;p=lttng-tools.git diff --git a/tests/regression/tools/relayd-grouping/test_ust b/tests/regression/tools/relayd-grouping/test_ust index 6c7eb98e5..64fb90e34 100755 --- a/tests/regression/tools/relayd-grouping/test_ust +++ b/tests/regression/tools/relayd-grouping/test_ust @@ -1,19 +1,8 @@ #!/bin/bash # -# Copyright (C) - 2018 Jonathan Rajotte +# Copyright (C) 2018 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="LTTng relayd filesystem grouping - Userspace tracing" @@ -27,10 +16,10 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" EVENT_NAME="tp:tptest" CHANNEL_NAME="my_channel" -XSD_PATH=$TESTDIR/../src/common/mi-lttng-3.0.xsd +XSD_PATH=$TESTDIR/../src/common/mi-lttng-4.0.xsd -XML_VALIDATE="$TESTDIR/regression/tools/mi/validate_xml $XSD_PATH" -XML_EXTRACT="$TESTDIR/regression/tools/mi/extract_xml" +XML_VALIDATE="$TESTDIR/utils/xml-utils/validate_xml $XSD_PATH" +XML_EXTRACT="$TESTDIR/utils/xml-utils/extract_xml" XPATH_CMD_OUTPUT="//lttng:command/lttng:output" XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session" @@ -51,7 +40,7 @@ function get_auto_session_name () local lttng_bin=$LTTNG_BIN LTTNG_BIN="${lttng_bin} --mi xml" - OUTPUT_DEST=$(mktemp) + OUTPUT_DEST=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX") list_lttng_with_opts $XML_VALIDATE "$OUTPUT_DEST" @@ -59,6 +48,7 @@ function get_auto_session_name () value=$($XML_EXTRACT "$OUTPUT_DEST" ${XPATH_SESSION}/lttng:name/text\(\)) ok $? "Extraction of session name" + rm -f $OUTPUT_DEST OUTPUT_DEST=/dev/null LTTNG_BIN=$lttng_bin @@ -87,7 +77,7 @@ function test_ust_uid_live () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -126,7 +116,7 @@ function test_ust_pid_live () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -166,7 +156,7 @@ function test_ust_uid_live_custom_output () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -205,7 +195,7 @@ function test_ust_uid_streaming () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -244,7 +234,7 @@ function test_ust_pid_streaming () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -284,7 +274,7 @@ function test_ust_uid_streaming_custom_output () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT stop_lttng_tracing_ok "$session_name" destroy_lttng_session_ok "$session_name" @@ -323,7 +313,7 @@ function test_ust_uid_streaming_rotate () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT rotate_session_ok "$session_name" stop_lttng_tracing_ok "$session_name" @@ -364,7 +354,7 @@ function test_ust_uid_streaming_rotate_custom_output () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT rotate_session_ok "$session_name" @@ -405,7 +395,7 @@ function test_ust_pid_streaming_rotate () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT rotate_session_ok "$session_name" stop_lttng_tracing_ok "$session_name" @@ -445,7 +435,7 @@ function test_ust_uid_streaming_snapshot () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT lttng_snapshot_record "$session_name" stop_lttng_tracing_ok "$session_name" @@ -473,8 +463,8 @@ function test_ust_pid_streaming_snapshot () local file_sync_after_first local file_sync_before_last - file_sync_after_first=$(mktemp -u) - file_sync_before_last=$(mktemp -u) + file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") if [ -z "$session_name" ]; then is_automatic_session=true @@ -491,7 +481,9 @@ function test_ust_pid_streaming_snapshot () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT "$file_sync_after_first" "$file_sync_before_last" /dev/null 2>&1 & + $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" 2>&1 & while [ ! -f "${file_sync_after_first}" ]; do sleep 0.5 @@ -542,7 +534,7 @@ function test_ust_uid_streaming_snapshot_add_output_default_name () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT lttng_snapshot_add_output_ok "$session_name" "net://localhost" lttng_snapshot_record "$session_name" @@ -585,7 +577,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT lttng_snapshot_add_output_ok "$session_name" "net://localhost" "-n $snapshot_name" lttng_snapshot_record "$session_name" @@ -631,7 +623,7 @@ function test_ust_uid_streaming_snapshot_add_output_custom_name_custom_output () enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME" start_lttng_tracing_ok "$session_name" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT lttng_snapshot_add_output_ok "$session_name" "net://localhost/$custom_output" "-n $snapshot_name" lttng_snapshot_record "$session_name" @@ -685,7 +677,7 @@ for fct_test in "${tests[@]}"; do for grouping in "${grouping_types[@]}"; do - TRACE_PATH=$(mktemp -d) + TRACE_PATH=$(mktemp --tmpdir -d tmp.test_relayd_grouping_ust_trace_path.XXXXXX) # Set the relayd in --group-output-by-session mode start_lttng_relayd "-o $TRACE_PATH $grouping" start_lttng_sessiond