X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=03b6e2da913ca31eca435c922db8dd9b1c50c857;hp=d32d9ed4564e9901b639b0588f2f3bdf217e6f61;hb=e563bbdb8fa6592790e9ac4e9db7d9decf022023;hpb=5fcaccbce7683a6af772d6f37d03fb01cf248a84

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index d32d9ed45..03b6e2da9 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -94,13 +94,13 @@ function test_jul_before_start ()
 	local file_sync_before_last=$(mktemp -u)
 
 	diag "Test JUL application BEFORE tracing starts"
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
 
 	# 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}
 
@@ -124,9 +124,9 @@ function test_jul_after_start ()
 {
 	diag "Test JUL application AFTER tracing starts"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_jul_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
@@ -145,9 +145,9 @@ function test_jul_loglevel ()
 {
 	diag "Test JUL application with loglevel"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_INFO"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
@@ -163,9 +163,9 @@ function test_jul_loglevel ()
 
 	diag "Test JUL applications with lower loglevel"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_SEVERE"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
@@ -181,9 +181,9 @@ function test_jul_loglevel ()
 
 	diag "Test JUL applications with higher loglevel"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_jul_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "JUL_FINER"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
 	run_app
@@ -200,10 +200,10 @@ function test_jul_loglevel_multiple ()
 {
 	diag "Test JUL application with multiple loglevel"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire two TP.
 	run_app 1
@@ -217,10 +217,10 @@ function test_jul_loglevel_multiple ()
 		return $?
 	fi
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire two TP.
 	run_app 1
@@ -239,13 +239,13 @@ function test_jul_multi_session_loglevel()
 {
 	diag "Test JUL with multiple session"
 
-	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
 	enable_jul_loglevel_only $SESSION_NAME-1 '*' "JUL_INFO"
-	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-1
 
-	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_jul_loglevel_only $SESSION_NAME-2 '*' "JUL_FINEST"
-	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
@@ -272,15 +272,15 @@ 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
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME-1
 
-	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_jul_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
@@ -307,16 +307,16 @@ 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
+	create_lttng_session_ok $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
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-2
 
 	run_app
 
@@ -342,14 +342,14 @@ function test_jul_disable_all()
 {
 	diag "Test JUL with multiple session with disabled all event"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_app 0 1
 
@@ -368,13 +368,13 @@ function test_jul_multi_session()
 {
 	diag "Test JUL with multiple session"
 
-	create_lttng_session $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+	create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
 	enable_jul_lttng_event $SESSION_NAME-1 $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME-1
+	start_lttng_tracing_ok $SESSION_NAME-1
 
-	create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+	create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
 	enable_jul_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
@@ -401,9 +401,9 @@ function test_jul_destroy_session()
 {
 	diag "Test JUL two session with destroy"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/first-sess
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
 	enable_jul_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
@@ -420,9 +420,9 @@ function test_jul_destroy_session()
 		return $?
 	fi
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/second-sess
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
 	enable_jul_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
@@ -444,10 +444,10 @@ function test_jul_filtering()
 {
 	diag "Test JUL filtering"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
 	# Enable all event with a filter.
 	enable_jul_filter $SESSION_NAME '*' 'msg == "JUL 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
@@ -461,11 +461,11 @@ function test_jul_filtering()
 		return $?
 	fi
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH/$SESSION_NAME
 	# Enable first Logger but filter msg payload for the INFO one while
 	# triggering the finest and second TP.
 	enable_jul_filter $SESSION_NAME $EVENT_NAME 'msg == "JUL tp fired!"'
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay, fire finest and second TP.
 	run_app 1 1
@@ -484,12 +484,12 @@ function test_jul_disable()
 {
 	diag "Test JUL disable event"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
@@ -508,12 +508,12 @@ function test_jul_disable_enable()
 {
 	diag "Test JUL disable event followed by an enable"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1
@@ -536,12 +536,12 @@ function test_jul_filter_loglevel()
 
 	diag "Test JUL a filter with a loglevel"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH/$SESSION_NAME
+	create_lttng_session_ok $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
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay and fire second TP.
 	run_app 0 1