projects / lttng-tools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Refactor: test: wrapper for create_lttng_session
[lttng-tools.git] / tests / regression / ust / java-log4j / test_java_log4j
diff --git a/tests/regression/ust/java-log4j/test_java_log4j b/tests/regression/ust/java-log4j/test_java_log4j
index b4846c323d625578815b1457ea4153b288e70e80..77df00a792b37ef489940eacfca97ef0e09973ba 100755 (executable)
--- a/tests/regression/ust/java-log4j/test_java_log4j
+++ b/tests/regression/ust/java-log4j/test_java_log4j
@@ -39,6 +39,7 @@ function run_app
        local debug_tp=$1
        local fire_second_tp=$2
 
+       # FIXME: test app should have synchro.
        java -cp $JAVA_CP -Djava.library.path="/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $debug_tp $fire_second_tp >/dev/null 2>&1
 }
 
@@ -90,8 +91,11 @@ function enable_log4j_filter_loglevel_only()
 
 function test_log4j_before_start ()
 {
+       local file_sync_after_first=$(mktemp -u)
+       local file_sync_before_last=$(mktemp -u)
+
        diag "Test LOG4J application BEFORE tracing starts"
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
 
        # Run 5 times with a 1 second delay
@@ -99,12 +103,17 @@ function test_log4j_before_start ()
 
        start_lttng_tracing $SESSION_NAME
 
+       touch ${file_sync_before_last}
+
        # Wait for the applications started in background
-       wait ${!}
+       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
@@ -116,7 +125,7 @@ function test_log4j_after_start ()
 {
        diag "Test LOG4J application AFTER tracing starts"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        start_lttng_tracing $SESSION_NAME
 
@@ -137,7 +146,7 @@ function test_log4j_loglevel ()
 {
        diag "Test LOG4J application with loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_INFO"
        start_lttng_tracing $SESSION_NAME
 
@@ -155,7 +164,7 @@ function test_log4j_loglevel ()
 
        diag "Test LOG4J applications with lower loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_FATAL"
        start_lttng_tracing $SESSION_NAME
 
@@ -173,7 +182,7 @@ function test_log4j_loglevel ()
 
        diag "Test LOG4J applications with higher loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_log4j_lttng_event_loglevel $SESSION_NAME $EVENT_NAME "LOG4J_TRACE"
        start_lttng_tracing $SESSION_NAME
 
@@ -192,7 +201,7 @@ function test_log4j_loglevel_multiple ()
 {
        diag "Test LOG4J application with multiple loglevel"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       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
@@ -209,7 +218,7 @@ function test_log4j_loglevel_multiple ()
                return $?
        fi
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH
+       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
@@ -231,11 +240,11 @@ function test_log4j_multi_session_loglevel()
 {
        diag "Test LOG4J 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_log4j_loglevel_only $SESSION_NAME-1 '*' "LOG4J_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_log4j_loglevel_only $SESSION_NAME-2 '*' "LOG4J_DEBUG"
        start_lttng_tracing $SESSION_NAME-2
 
@@ -264,13 +273,13 @@ function test_log4j_multi_session_disable()
 {
        diag "Test LOG4J 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_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
 
-       create_lttng_session $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       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
 
@@ -299,10 +308,10 @@ function test_log4j_multi_session_disable_wildcard()
 {
        diag "Test LOG4J 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_log4j_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_log4j_lttng_event $SESSION_NAME-2 '*'
 
        disable_log4j_lttng_event $SESSION_NAME-1 '*'
@@ -334,7 +343,7 @@ function test_log4j_disable_all()
 {
        diag "Test LOG4J 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_log4j_lttng_event $SESSION_NAME '*'
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
@@ -360,11 +369,11 @@ function test_log4j_multi_session()
 {
        diag "Test LOG4J 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_log4j_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_log4j_lttng_event $SESSION_NAME-2 $EVENT_NAME2
        start_lttng_tracing $SESSION_NAME-2
 
@@ -393,14 +402,14 @@ function test_log4j_destroy_session()
 {
        diag "Test LOG4J two session with destroy"
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/first-sess
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/first-sess
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        start_lttng_tracing $SESSION_NAME
 
        # Run 5 times with a 1 second delay
        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
@@ -411,12 +420,14 @@ function test_log4j_destroy_session()
                return $?
        fi
 
-       create_lttng_session $SESSION_NAME $TRACE_PATH/second-sess
+       create_lttng_session_ok $SESSION_NAME $TRACE_PATH/second-sess
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
        start_lttng_tracing $SESSION_NAME
 
+       # Run 5 times with a 1 second delay
+       run_app_background 0 1
        # Wait for the applications started in background
-       wait ${!}
+       wait
 
        stop_lttng_tracing $SESSION_NAME
        destroy_lttng_session $SESSION_NAME
@@ -432,7 +443,7 @@ function test_log4j_filtering()
 {
        diag "Test LOG4J 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_log4j_filter $SESSION_NAME '*' 'msg == "LOG4J second logger fired"'
        start_lttng_tracing $SESSION_NAME
@@ -449,7 +460,7 @@ function test_log4j_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 debug and second TP.
        enable_log4j_filter $SESSION_NAME $EVENT_NAME 'msg == "LOG4J tp fired!"'
@@ -472,7 +483,7 @@ function test_log4j_disable()
 {
        diag "Test LOG4J 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_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2
@@ -496,7 +507,7 @@ function test_log4j_disable_enable()
 {
        diag "Test LOG4J 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_log4j_lttng_event $SESSION_NAME $EVENT_NAME
        disable_log4j_lttng_event $SESSION_NAME $EVENT_NAME
@@ -524,7 +535,7 @@ function test_log4j_filter_loglevel()
 
        diag "Test LOG4J 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_log4j_filter_loglevel_only $SESSION_NAME $BOGUS_EVENT_NAME "$FILTER" LOG4J_INFO
        disable_log4j_lttng_event $SESSION_NAME $BOGUS_EVENT_NAME
LTTng 2.0 tools and control repository
This page took 0.03366 seconds and 4 git commands to generate.