TRACE_PATH=$(mktemp -d)
-NUM_TESTS=16
+NUM_TESTS=53
source $TESTDIR/utils/utils.sh
function run_app
{
- java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT >/dev/null 2>&1 &
+ local finest_tp=$1
+
+ java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp >/dev/null 2>&1 &
}
function 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
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
}
function test_jul_after_start ()
stop_lttng_tracing $SESSION_NAME
destroy_lttng_session $SESSION_NAME
+
+ # Validate test. Expecting all events.
+ trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
+}
+
+function test_jul_loglevel ()
+{
+ diag "Test JUL application with loglevel"
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH
+ enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
+ start_lttng_tracing $SESSION_NAME
+
+ # 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
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
+
+ diag "Test JUL applications with lower loglevel"
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH
+ enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_SEVERE"
+ start_lttng_tracing $SESSION_NAME
+
+ # 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
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
+
+ diag "Test JUL applications with higher loglevel"
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH
+ enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINER"
+ start_lttng_tracing $SESSION_NAME
+
+ # 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
+ return $?
+}
+
+function test_jul_loglevel_multiple ()
+{
+ diag "Test JUL application with multiple loglevel"
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH
+ enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
+ enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINEST"
+ start_lttng_tracing $SESSION_NAME
+
+ # 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
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
+
+ create_lttng_session $SESSION_NAME $TRACE_PATH
+ enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_INFO"
+ enable_jul_lttng_event_loglevel $SESSION_NAME '*' "JUL_FINEST"
+ start_lttng_tracing $SESSION_NAME
+
+ # 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
+ if [ $? -ne 0 ]; then
+ return $?
+ fi
}
plan_tests $NUM_TESTS
start_lttng_sessiond
tests=(
+ test_jul_loglevel
+ test_jul_loglevel_multiple
test_jul_before_start
test_jul_after_start
)
for fct_test in ${tests[@]};
do
${fct_test}
-
- # Validate test
- validate_trace $EVENT_NAME $TRACE_PATH
- if [ $? -eq 0 ]; then
- # Only delete if successful
- rm -rf $TRACE_PATH
- else
- break
+ if [ $? -ne 0 ]; then
+ break;
fi
+ rm -rf $TRACE_PATH
done
stop_lttng_sessiond