Refactor: test: wrapper for create_lttng_session

[lttng-tools.git] / tests / regression / ust / java-jul / test_java_jul

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index d16880f277aa77ad9da5d10d8630340be3957c5a..4835e3dcd6885eae79c020329fa85c7134293e9c 100755 (executable)
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -38,6 +38,7 @@ function run_app
        local finest_tp=$1
        local fire_second_tp=$2
 
+       #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
 }
 
@@ -89,23 +90,29 @@ function enable_jul_filter_loglevel_only()
 
 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
+       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
 
-       #FIXME: racy missing synchronization
-
        start_lttng_tracing $SESSION_NAME
 
+       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_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
        if [ $? -ne 0 ]; then
@@ -117,7 +124,7 @@ 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
 
@@ -138,7 +145,7 @@ 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
 
@@ -156,7 +163,7 @@ 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
 
@@ -174,7 +181,7 @@ 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
 
@@ -193,7 +200,7 @@ 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
@@ -210,7 +217,7 @@ 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
@@ -232,11 +239,11 @@ 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
 
-       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
 
@@ -265,13 +272,13 @@ 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
 
-       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
 
@@ -300,10 +307,10 @@ 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 '*'
@@ -335,7 +342,7 @@ 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
@@ -361,11 +368,11 @@ 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
 
-       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
 
@@ -394,7 +401,7 @@ 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
 
@@ -413,7 +420,7 @@ 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
 
@@ -437,7 +444,7 @@ 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
@@ -454,7 +461,7 @@ 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!"'
@@ -477,7 +484,7 @@ 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
@@ -501,7 +508,7 @@ 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
@@ -529,7 +536,7 @@ 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