KERNEL_MAJOR_VERSION=2
KERNEL_MINOR_VERSION=6
KERNEL_PATCHLEVEL_VERSION=27
+TRACE_FORMAT_OUTPUT=${LTTNG_TESTS_TRACE_FORMAT:-ctf2}
# We set the default UST register timeout and network and app socket timeout to
# "wait forever", so that basic tests don't have to worry about hitting
LTTNG_BAIL_OUT "*** Kernel too old for session daemon tests ***"
fi
- diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/"
- : "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/config/"}"
+ diag "export LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/"
+ : "${LTTNG_SESSION_CONFIG_XSD_PATH="${DIR}/../src/common/"}"
export LTTNG_SESSION_CONFIG_XSD_PATH
if [ -z "$(lttng_pgrep "${SESSIOND_MATCH}")" ]; then
function list_lttng_with_opts ()
{
+ local ret
+ local withtap=$1
+ shift
local opts=$1
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
list $opts
- ok $? "Lttng-tool list command with option $opts"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Lttng-tool list command with option $opts"
+ fi
+}
+
+function list_lttng_ok ()
+{
+ list_lttng_with_opts 1 "$@"
+}
+
+function list_lttng_notap ()
+{
+ list_lttng_with_opts 0 "$@"
}
function create_lttng_session_no_output ()
{
local sess_name=$1
local opts="${@:2}"
+ local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT")
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- create $sess_name --no-output $opts
+ create "${trace_format[@]}" $sess_name --no-output $opts
ok $? "Create session $sess_name in no-output mode"
}
local sess_name=$1
local uri=$2
local opts="${@:3}"
+ local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT")
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- create $sess_name -U $uri $opts
+ create "${trace_format[@]}" $sess_name -U $uri $opts
ok $? "Create session $sess_name with uri:$uri and opts: $opts"
}
local sess_name=$3
local trace_path=$4
local opt=$5
+ local trace_format=("--trace-format" "$TRACE_FORMAT_OUTPUT")
if [ -z "$trace_path" ]; then
# Use lttng-sessiond default output.
fi
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- create "$sess_name" $trace_path $opt
+ create "${trace_format[@]}" "$sess_name" $trace_path $opt
ret=$?
if [ $expected_to_fail -eq "1" ]; then
test "$ret" -ne "0"
function enable_log4j_lttng_event()
{
- sess_name=$1
- event_name="$2"
- channel_name=$3
+ local sess_name=$1
+ local event_name=$2
+ local channel_name=$3
- if [ -z $channel_name ]; then
- # default channel if none specified
- chan=""
- else
- chan="-c $channel_name"
+ local chan_opt=()
+
+ # default channel if none specified
+ if [ -n "$channel_name" ]; then
+ chan_opt=("-c" "$channel_name")
fi
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- enable-event "$event_name" $chan -s $sess_name -l
- ok $? "Enable LOG4J event $event_name for session $sess_name"
+ enable-event "$event_name" "${chan_opt[@]}" -s "$sess_name" --log4j
+ ok $? "Enable LOG4J event '$event_name' for session '$sess_name'"
+}
+
+function enable_log4j_lttng_event_filter()
+{
+ local sess_name=$1
+ local event_name=$2
+ local filter=$3
+
+ _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
+ enable-event "$event_name" -s "$sess_name" --log4j --filter "$filter"
+ ok $? "Enable LOG4J event '$event_name' with filter '$filter' for session '$sess_name'"
+}
+
+function enable_log4j_lttng_event_filter_loglevel_only()
+{
+ local sess_name=$1
+ local event_name=$2
+ local filter=$3
+ local loglevel=$4
+
+ _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
+ enable-event --loglevel-only "$loglevel" "$event_name" -s "$sess_name" -l --filter "$filter"
+ ok $? "Enable LOG4J event '$event_name' with filter '$filter' and loglevel-only '$loglevel' for session '$sess_name'"
}
function enable_log4j_lttng_event_loglevel()
{
local sess_name=$1
- local event_name="$2"
+ local event_name=$2
local loglevel=$3
local channel_name=$4
- if [ -z $channel_name ]; then
- # default channel if none specified
- chan=""
- else
- chan="-c $channel_name"
+
+ # default channel if none specified
+ if [ -n "$channel_name" ]; then
+ chan_opt=("-c" "$channel_name")
fi
_run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
- enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l
- ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
+ enable-event --loglevel "$loglevel" "$event_name" "${chan_opt[@]}" -s "$sess_name" --log4j
+ ok $? "Enable LOG4J event '$event_name' for session '$sess_name' with loglevel '$loglevel'"
+}
+
+function enable_log4j_lttng_event_loglevel_only()
+{
+ local sess_name=$1
+ local event_name=$2
+ local loglevel=$3
+ local channel_name=$4
+
+ local chan_opt=()
+
+ # default channel if none specified
+ if [ -n "$channel_name" ]; then
+ chan_opt=("-c" "$channel_name")
+ fi
+
+ _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
+ enable-event --loglevel-only "$loglevel" "$event_name" "${chan_opt[@]}" -s "$sess_name" --log4j
+ ok $? "Enable LOG4J event '$event_name' for session '$sess_name' with loglevel-only '$loglevel'"
}
function enable_python_lttng_event()
local sess_name="$1"
local event_name="$2"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name -l >/dev/null 2>&1
- ok $? "Disable LOG4J event $event_name for session $sess_name"
+ _run_lttng_cmd "$OUTPUT_DEST" "$ERROR_OUTPUT_DEST" \
+ disable-event "$event_name" -s "$sess_name" --log4j
+ ok $? "Disable LOG4J event '$event_name' for session '$sess_name'"
}
function disable_python_lttng_event ()
local count=$($BABELTRACE_BIN --output-format=ctf-metadata $metadata_path | grep $event_name | wc -l)
if [ "$count" -ne "$nr_event_id" ]; then
- fail "Metadata match with the metadata of $count event(s) named $event_name"
- diag "$count matching event id found in metadata"
+ fail "Metadata match with the metadata of $nr_event_id event(s) named $event_name"
+ diag "$count matching event names found in metadata"
else
- pass "Metadata match with the metadata of $count event(s) named $event_name"
+ pass "Metadata match with the metadata of $nr_event_id event(s) named $event_name"
fi
}
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected fail on rotate session $sess_name"
+ ok $? "Expected to fail to set a periodic rotation of session $sess_name" "every " $size " bytes"
else
- ok $ret "Rotate session $sess_name"
+ ok $ret "Set a scheduled rotation of session $sess_name" "every " $size " bytes"
fi
}