X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=50452023b55e49538a0df3f60cdae1198d48e3d8;hp=bd6a0e9b3dd701ac1677f7065e4350e28ef6cfde;hb=9b21e6d59ee650f44a0db24cf7f75e08fbd0fe9c;hpb=88f54ca9bfdda70f0979cf8cc06ac35ccf1724ee

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index bd6a0e9b3..50452023b 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -26,19 +26,21 @@ TESTAPP_BIN="$TESTAPP_NAME.java"
 TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
 SESSION_NAME="jul"
 EVENT_NAME="JTestLTTng"
+EVENT_NAME2="JTestLTTng2"
 JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=53
+NUM_TESTS=66
 
 source $TESTDIR/utils/utils.sh
 
 function run_app
 {
 	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 >/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
@@ -199,6 +201,40 @@ function test_jul_loglevel_multiple ()
 	fi
 }
 
+function test_jul_multi_session()
+{
+	diag "Test JUL with multiple session"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	start_lttng_tracing $SESSION_NAME-1
+
+	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
+	start_lttng_tracing $SESSION_NAME-2
+
+	# 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-1
+	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
+	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
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -218,6 +254,7 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 		test_jul_loglevel_multiple
 		test_jul_before_start
 		test_jul_after_start
+		test_jul_multi_session
 	)
 
 	for fct_test in ${tests[@]};