X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=dc6e677f30a2966ac36c900d70779bd53693301f;hb=d53addeb964039ae2f544de1d7d452fb5ad6da69;hp=0baa287038ccf614e169f26621c5cde43a87f099;hpb=34c40351d4b1341e24944e4edf2174e58eefae1a;p=lttng-tools.git

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index 0baa28703..dc6e677f3 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -29,7 +29,7 @@ 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"
 
-NUM_TESTS=106
+NUM_TESTS=124
 
 source $TESTDIR/utils/utils.sh
 
@@ -38,15 +38,12 @@ 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 $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()
@@ -86,17 +83,18 @@ 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
@@ -113,13 +111,11 @@ function test_jul_after_start ()
 	# 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
@@ -136,13 +132,11 @@ function test_jul_loglevel ()
 	# 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
@@ -156,13 +150,11 @@ function test_jul_loglevel ()
 	# 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
@@ -176,13 +168,11 @@ function test_jul_loglevel ()
 	# 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 $?
 }
 
@@ -197,13 +187,12 @@ function test_jul_loglevel_multiple ()
 
 	# 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
@@ -215,13 +204,12 @@ function test_jul_loglevel_multiple ()
 
 	# 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
@@ -241,7 +229,6 @@ function test_jul_multi_session_loglevel()
 
 	# 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
@@ -249,13 +236,48 @@ function test_jul_multi_session_loglevel()
 	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
+}
+
+function test_jul_multi_session_disable()
+{
+	diag "Test JUL with multiple session with disabled event"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME2
+	disable_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
+
+	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 one event of the second TP.
+	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_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
 	if [ $? -ne 0 ]; then
 		return $?
 	fi
@@ -275,7 +297,6 @@ function test_jul_multi_session()
 
 	# 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
@@ -283,13 +304,13 @@ function test_jul_multi_session()
 	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
@@ -304,7 +325,7 @@ function test_jul_destroy_session()
 	start_lttng_tracing $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
-	run_app 0 1
+	run_app_background 0 1
 
 	sleep 1
 
@@ -321,13 +342,14 @@ function test_jul_destroy_session()
 	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
@@ -344,13 +366,12 @@ function test_jul_filtering()
 
 	# 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
@@ -363,13 +384,60 @@ function test_jul_filtering()
 
 	# 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
+}
+
+function test_jul_disable()
+{
+	diag "Test JUL disable event"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	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 one event of the second TP only.
+	trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_disable_enable()
+{
+	diag "Test JUL disable event followed by an enable"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	# Enable all event with a filter.
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	disable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	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 NR_ITER event of the main INFO tp.
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
 	if [ $? -ne 0 ]; then
 		return $?
 	fi
@@ -390,6 +458,9 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_multi_session_disable
+		test_jul_disable
+		test_jul_disable_enable
 		test_jul_filtering
 		test_jul_multi_session_loglevel
 		test_jul_destroy_session