X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2Ftest_java_log4j;h=9fd059447d041081c661763307a009afe88a54c7;hp=77df00a792b37ef489940eacfca97ef0e09973ba;hb=96340a015194538227efcbc654ec02c2ed9961ce;hpb=bf6ae429bc7bf2fefdce61e48806768dab7567d5

diff --git a/tests/regression/ust/java-log4j/test_java_log4j b/tests/regression/ust/java-log4j/test_java_log4j
index 77df00a79..9fd059447 100755
--- a/tests/regression/ust/java-log4j/test_java_log4j
+++ b/tests/regression/ust/java-log4j/test_java_log4j
@@ -101,14 +101,14 @@ function test_log4j_before_start ()
 	# Run 5 times with a 1 second delay
 	run_app_background
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	touch ${file_sync_before_last}
 
 	# Wait for the applications started in background
 	wait
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	rm -f ${file_sync_after_first}
@@ -127,12 +127,12 @@ function test_log4j_after_start ()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting all events.
@@ -148,12 +148,12 @@ function test_log4j_loglevel ()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_INFO"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting all events.
@@ -166,12 +166,12 @@ function test_log4j_loglevel ()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_FATAL"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting 0 events.
@@ -184,12 +184,12 @@ function test_log4j_loglevel ()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_TRACE"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting all events.
@@ -204,12 +204,12 @@ function test_log4j_loglevel_multiple ()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_INFO"
 	enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_DEBUG"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire two TP.
 	run_app 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting all events times two.
@@ -221,12 +221,12 @@ function test_log4j_loglevel_multiple ()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_log4j_lttng_event_loglevel $SESSION_NAME '*' "LOG4J_INFO"
 	enable_log4j_lttng_event_loglevel $SESSION_NAME '*' "LOG4J_DEBUG"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire two TP.
 	run_app 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting all events times two.
@@ -242,17 +242,17 @@ function test_log4j_multi_session_loglevel()
 
 	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
 	enable_log4j_loglevel_only $SESSION_NAME-1 '*' "LOG4J_INFO"
-	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-1
 
 	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_log4j_loglevel_only $SESSION_NAME-2 '*' "LOG4J_DEBUG"
-	start_lttng_tracing $SESSION_NAME-2
+	start_lttng_tracing_ok $SESSION_NAME-2
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 1 1
 
-	stop_lttng_tracing $SESSION_NAME-1
-	stop_lttng_tracing $SESSION_NAME-2
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
 	destroy_lttng_session $SESSION_NAME-1
 	destroy_lttng_session $SESSION_NAME-2
 
@@ -277,17 +277,17 @@ function test_log4j_multi_session_disable()
 	enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
 	enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME2
 	disable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-1
 
 	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_log4j_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-	start_lttng_tracing $SESSION_NAME-2
+	start_lttng_tracing_ok $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
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
 	destroy_lttng_session $SESSION_NAME-1
 	destroy_lttng_session $SESSION_NAME-2
 
@@ -316,13 +316,13 @@ function test_log4j_multi_session_disable_wildcard()
 
 	disable_log4j_lttng_event $SESSION_NAME-1 '*'
 
-	start_lttng_tracing $SESSION_NAME-1
-	start_lttng_tracing $SESSION_NAME-2
+	start_lttng_tracing_ok $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-2
 
 	run_app
 
-	stop_lttng_tracing $SESSION_NAME-1
-	stop_lttng_tracing $SESSION_NAME-2
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
 	destroy_lttng_session $SESSION_NAME-1
 	destroy_lttng_session $SESSION_NAME-2
 
@@ -350,11 +350,11 @@ function test_log4j_disable_all()
 
 	disable_log4j_lttng_event $SESSION_NAME '*'
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_app 0 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting NO event of the first TP and second TP.
@@ -371,17 +371,17 @@ function test_log4j_multi_session()
 
 	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
 	enable_log4j_lttng_event $SESSION_NAME-1 $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-1
 
 	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_log4j_lttng_event $SESSION_NAME-2 $EVENT_NAME2
-	start_lttng_tracing $SESSION_NAME-2
+	start_lttng_tracing_ok $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
+	stop_lttng_tracing_ok $SESSION_NAME-1
+	stop_lttng_tracing_ok $SESSION_NAME-2
 	destroy_lttng_session $SESSION_NAME-1
 	destroy_lttng_session $SESSION_NAME-2
 
@@ -404,14 +404,14 @@ function test_log4j_destroy_session()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# 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
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting at least one event num 1
@@ -422,14 +422,14 @@ function test_log4j_destroy_session()
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# 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
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting only one event num 2
@@ -446,12 +446,12 @@ function test_log4j_filtering()
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
 	# Enable all event with a filter.
 	enable_log4j_filter $SESSION_NAME '*' 'msg == "LOG4J second logger fired"'
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting one event of the second TP only.
@@ -464,12 +464,12 @@ function test_log4j_filtering()
 	# Enable first Logger but filter msg payload for the INFO one while
 	# triggering the debug and second TP.
 	enable_log4j_filter $SESSION_NAME $EVENT_NAME 'msg == "LOG4J tp fired!"'
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay, fire debug and second TP.
 	run_app 1 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting NR_ITER event of the main INFO tp.
@@ -488,12 +488,12 @@ function test_log4j_disable()
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
 	disable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting one event of the second TP only.
@@ -512,12 +512,12 @@ function test_log4j_disable_enable()
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
 	disable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
 	enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting NR_ITER event of the main INFO tp.
@@ -540,12 +540,12 @@ function test_log4j_filter_loglevel()
 	enable_log4j_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" LOG4J_INFO
 	disable_log4j_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
 	enable_log4j_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" LOG4J_INFO
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
 
 	# Validate test. Expecting no events.