X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=d32d9ed4564e9901b639b0588f2f3bdf217e6f61;hp=bf3bb0bc27dfa4820877acbe031f9bc84bebc2b2;hb=d324faf7d618feb0b209c8c7da497b244fa7046a;hpb=1d842d5af5b13a90c9e587a1bb7ec0c27ae6dae2

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index bf3bb0bc2..d32d9ed45 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -27,9 +27,9 @@ 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"
+JAVA_CP="$CURDIR:/usr/local/share/java/liblttng-ust-agent.jar:/usr/share/java/liblttng-ust-agent.jar"
 
-NUM_TESTS=139
+NUM_TESTS=155
 
 source $TESTDIR/utils/utils.sh
 
@@ -38,15 +38,13 @@ 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 &
+	#FIXME: app should have synchro.
+	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()
@@ -77,26 +75,46 @@ function enable_jul_filter()
 	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 ()
 {
+	local file_sync_after_first=$(mktemp -u)
+	local file_sync_before_last=$(mktemp -u)
+
 	diag "Test JUL application BEFORE tracing starts"
 	create_lttng_session $SESSION_NAME $TRACE_PATH
 	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
+	touch ${file_sync_before_last}
+
+	# Wait for the applications started in background
+	wait
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
+	rm -f ${file_sync_after_first}
+	rm -f ${file_sync_before_last}
+
 	# 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 +131,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 +152,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 +170,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 +188,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 +207,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 +224,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 +249,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 +256,13 @@ 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
@@ -277,7 +284,6 @@ function test_jul_multi_session_disable()
 
 	# 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
@@ -285,13 +291,74 @@ function test_jul_multi_session_disable()
 	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
+}
+
+function test_jul_multi_session_disable_wildcard()
+{
+	diag "Test JUL with multiple session with disabled wildcard event"
+
+	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	enable_jul_lttng_event $SESSION_NAME-1 '*'
+
+	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	enable_jul_lttng_event $SESSION_NAME-2 '*'
+
+	disable_jul_lttng_event $SESSION_NAME-1 '*'
+
+	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing $SESSION_NAME-2
+
+	run_app
+
+	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 NO event of the first TP.
+	trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+
+	# Validate test. Expecting all events of the first TP.
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+	if [ $? -ne 0 ]; then
+		return $?
+	fi
+}
+
+function test_jul_disable_all()
+{
+	diag "Test JUL with multiple session with disabled all event"
+
+	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	enable_jul_lttng_event $SESSION_NAME '*'
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
+
+	disable_jul_lttng_event $SESSION_NAME '*'
+
+	start_lttng_tracing $SESSION_NAME
+
+	run_app 0 1
+
+	stop_lttng_tracing $SESSION_NAME
+	destroy_lttng_session $SESSION_NAME
+
+	# Validate test. Expecting NO event of the first TP and second TP.
+	trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME
+	trace_match_only $EVENT_NAME2 0 $TRACE_PATH/$SESSION_NAME
 	if [ $? -ne 0 ]; then
 		return $?
 	fi
@@ -311,7 +378,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
@@ -319,13 +385,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
@@ -340,9 +406,10 @@ 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
+	# Wait for the applications started in background
+	wait
 
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
@@ -357,13 +424,17 @@ function test_jul_destroy_session()
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
 	start_lttng_tracing $SESSION_NAME
 
-	wait_apps
+	# Run 5 times with a 1 second delay
+	run_app_background 0 1
+
+	# 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
@@ -380,13 +451,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
@@ -399,13 +469,12 @@ 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
@@ -424,13 +493,12 @@ function test_jul_disable()
 
 	# 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
@@ -449,13 +517,40 @@ function test_jul_disable_enable()
 
 	# 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
@@ -476,9 +571,11 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 	start_lttng_sessiond
 
 	tests=(
+		test_jul_multi_session_disable_wildcard
 		test_jul_multi_session_disable
 		test_jul_disable
 		test_jul_disable_enable
+		test_jul_disable_all
 		test_jul_filtering
 		test_jul_multi_session_loglevel
 		test_jul_destroy_session
@@ -487,6 +584,7 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 		test_jul_before_start
 		test_jul_after_start
 		test_jul_multi_session
+		test_jul_filter_loglevel
 	)
 
 	for fct_test in ${tests[@]};