EVENT_NAME2="JTestLTTng2"
JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar"
-NUM_TESTS=139
+NUM_TESTS=131
source $TESTDIR/utils/utils.sh
local finest_tp=$1
local fire_second_tp=$2
- java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1 &
+ java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1
}
-function wait_apps
+function run_app_background
{
- while [ -n "$(pidof java)" ]; do
- sleep 0.5
- done
- pass "Wait for applications to end"
+ run_app $@ &
}
function enable_jul_loglevel_only()
ok $? "Enable event $event_name with filter $filter for session $sess_name"
}
+function enable_jul_filter_loglevel_only()
+{
+ local sess_name="$1"
+ local event_name="$2"
+ local filter="$3"
+ local loglevel="$4"
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel-only $loglevel "$event_name" -s $sess_name -j --filter "$filter" >/dev/null 2>&1
+ ok $? "Enable event $event_name with filter \"$filter\" and loglevel-only $loglevel for session $sess_name"
+}
+
# MUST set TESTDIR before calling those functions
function test_jul_before_start ()
enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
- run_app
+ run_app_background
start_lttng_tracing $SESSION_NAME
- wait_apps
+ # Wait for the applications started in background
+ wait ${!}
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay
run_app
- wait_apps
-
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay
run_app
- wait_apps
-
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay
run_app
- wait_apps
-
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting 0 events.
- trace_matches $EVENT_NAME 0 $TRACE_PATH
+ trace_match_only $EVENT_NAME 0 $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay
run_app
- wait_apps
-
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
return $?
}
# Run 5 times with a 1 second delay and fire two TP.
run_app 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events times two.
- trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+ trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire two TP.
run_app 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting all events times two.
- trace_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+ trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 1 1
- wait_apps
stop_lttng_tracing $SESSION_NAME-1
stop_lttng_tracing $SESSION_NAME-2
destroy_lttng_session $SESSION_NAME-2
# Expecting 6 events being the main event plus the second tp.
- trace_matches $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
+ trace_match_only $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
if [ $? -ne 0 ]; then
return $?
fi
# Expectin 5 events being the finest TP.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 0 1
- wait_apps
stop_lttng_tracing $SESSION_NAME-1
stop_lttng_tracing $SESSION_NAME-2
destroy_lttng_session $SESSION_NAME-2
# Validate test. Expecting one event of the second TP.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1
if [ $? -ne 0 ]; then
return $?
fi
# Validate test. Expecting one event of the second TP.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 0 1
- wait_apps
stop_lttng_tracing $SESSION_NAME-1
stop_lttng_tracing $SESSION_NAME-2
destroy_lttng_session $SESSION_NAME-2
# Validate test. Expecting all events of first TP
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
if [ $? -ne 0 ]; then
return $?
fi
# Validate test. Expecting one event of the second TP.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
if [ $? -ne 0 ]; then
return $?
fi
start_lttng_tracing $SESSION_NAME
# Run 5 times with a 1 second delay
- run_app 0 1
+ run_app_background 0 1
sleep 1
enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
start_lttng_tracing $SESSION_NAME
- wait_apps
+ # Wait for the applications started in background
+ wait ${!}
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting only one event num 2
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/second-sess
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/second-sess
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 0 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting one event of the second TP only.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay, fire finest and second TP.
run_app 1 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting NR_ITER event of the main INFO tp.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 0 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting one event of the second TP only.
- trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+ trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
if [ $? -ne 0 ]; then
return $?
fi
# Run 5 times with a 1 second delay and fire second TP.
run_app 0 1
- wait_apps
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
# Validate test. Expecting NR_ITER event of the main INFO tp.
- trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+ trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
+}
+
+function test_jul_filter_loglevel()
+{
+ local BOGUS_EVENT_NAME="not_a_real_event"
+ local FILTER="int_loglevel > 700 || int_loglevel < 700"
+ local ALL_EVENTS="."
+
+ diag "Test JUL a filter with a loglevel"
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+ # Enable an event with a filter and the loglevel-only option.
+ enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
+ disable_jul_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
+ enable_jul_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" JUL_CONFIG
+ start_lttng_tracing $SESSION_NAME
+
+ # Run 5 times with a 1 second delay and fire second TP.
+ run_app 0 1
+
+ stop_lttng_tracing $SESSION_NAME
+ destroy_lttng_session $SESSION_NAME
+
+ # Validate test. Expecting no events.
+ trace_match_only $ALL_EVENTS 0 $TRACE_PATH/$SESSION_NAME
if [ $? -ne 0 ]; then
return $?
fi
test_jul_before_start
test_jul_after_start
test_jul_multi_session
+ test_jul_filter_loglevel
)
for fct_test in ${tests[@]};