EVENT_NAME="tp:tptest"
CHANNEL_NAME="my_channel"
-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"
-
XPATH_CMD_OUTPUT="//lttng:command/lttng:output"
XPATH_SESSION="$XPATH_CMD_OUTPUT/lttng:sessions/lttng:session"
-
-NUM_TESTS=688
+NUM_TESTS=254
source "$TESTDIR/utils/utils.sh"
local lttng_bin=$LTTNG_BIN
LTTNG_BIN="${lttng_bin} --mi xml"
- OUTPUT_DEST=$(mktemp --tmpdir "tmp.${FUNCNAME[0]}_output.XXXXXX")
+ OUTPUT_DEST=$(mktemp -t "tmp.${FUNCNAME[0]}_output.XXXXXX")
- list_lttng_with_opts
- $XML_VALIDATE "$OUTPUT_DEST"
+ list_lttng_ok
+ $MI_VALIDATE "$OUTPUT_DEST"
ok $? "Valid lttng list XML"
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
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST uid buffer live [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer live [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost --live
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST pid buffer live [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST pid buffer live [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost --live
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
local session_name="$1"
local grouping="$2"
local custom_output="my_live_custom_output"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST uid buffer live, custom output [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer live, custom output [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost/$custom_output --live
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST uid buffer streaming [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer streaming [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST pid buffer streaming [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST pid buffer streaming [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
local session_name="$1"
local grouping="$2"
local custom_output="custom_second_token"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST uid buffer streaming, custom output [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer streaming, custom output [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost/$custom_output
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST uid buffer rotate [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer rotate [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
rotate_session_ok "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
local session_name="$1"
local grouping="$2"
local custom_output="rotate_custom_path"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST uid buffer rotate, custom output [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer rotate, custom output [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost/$custom_output
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
-
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
- diag "Test UST pid buffer rotate with session_name [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST pid buffer rotate with session_name [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
rotate_session_ok "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST uid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost --snapshot
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-uid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
lttng_snapshot_record "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME*"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
local file_sync_after_first
local file_sync_before_last
- 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")
+ file_sync_after_first=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+ file_sync_before_last=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST pid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST pid buffer snapshot streaming using 'create --snapshot' [$grouping][${session_name}]"
create_lttng_session_uri "$session_name" net://localhost --snapshot
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_ust_lttng_channel_ok "$session_name" "$CHANNEL_NAME" "--buffers-pid"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
wait
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/snapshot-1*"
{
local session_name="$1"
local grouping="$2"
- local is_automatic_session=false
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST uid buffer snapshot using 'add-output' with default snapshot name [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer snapshot using 'add-output' with default snapshot name [$grouping][${session_name}]"
create_lttng_session_no_output "$session_name"
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
lttng_snapshot_record "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/snapshot-1*"
local session_name="$1"
local grouping="$2"
local snapshot_name="this_is_my_snapshot"
- local is_automatic_session=false
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name [$grouping][${session_name}]"
create_lttng_session_no_output "$session_name"
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
lttng_snapshot_record "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
# When session name is automatic, the actual directory is "auto", not
# auto-<datetime>.
local grouping="$2"
local snapshot_name="this_is_my_snapshot"
local custom_output="this/is/my/custom/path"
- local is_automatic_session=false
- if [ -z "$session_name" ]; then
- is_automatic_session=true
- fi
-
- diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name and custom output path [$grouping][${session_name:-automatic session name}]"
+ diag "Test UST uid buffer snapshot using 'add-output' with custom snapshot name and custom output path [$grouping][${session_name}]"
create_lttng_session_no_output "$session_name"
- if [ "$is_automatic_session" = true ]; then
- get_auto_session_name session_name
- fi
enable_lttng_mmap_overwrite_ust_channel "$session_name" "$CHANNEL_NAME"
enable_ust_lttng_event_ok "$session_name" "$EVENT_NAME" "$CHANNEL_NAME"
lttng_snapshot_record "$session_name"
stop_lttng_tracing_ok "$session_name"
- destroy_lttng_session_ok "$session_name"
+ destroy_lttng_session_ok "$session_name" --no-wait
if [ "$grouping" = "$GROUP_BY_SESSION" ]; then
validate_trace "$EVENT_NAME" "$TRACE_PATH/$session_name/$HOSTNAME-*/$custom_output/$snapshot_name*"
print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
tests=(
test_ust_uid_live
$GROUP_BY_SESSION
$GROUP_BY_HOSTNAME
)
-for fct_test in "${tests[@]}";
+for grouping in "${grouping_types[@]}";
do
- for grouping in "${grouping_types[@]}";
+ TRACE_PATH=$(mktemp -d -t 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
+ for fct_test in "${tests[@]}";
do
- 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
-
- name=""
- # Perform test when session name is generated by the client
- ${fct_test} "$name" "$grouping"
- count=$(find "$TRACE_PATH/" -maxdepth 1 -mindepth 1 | wc -l)
- is "$count" "0" "LTTng-relayd output directory empty"
-
# Perform test when session name is given
name="my-session"
${fct_test} "$name" "$grouping"
count=$(find "$TRACE_PATH/" -maxdepth 1 -mindepth 1 | wc -l)
is "$count" "0" "LTTng-relayd output directory empty"
-
- rm -rf "$TRACE_PATH"
- stop_lttng_relayd
- stop_lttng_sessiond
done
+ rm -rf "$TRACE_PATH"
+ stop_lttng_relayd
+ stop_lttng_sessiond
done
-