X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=f9f244b61611523be8d030eddc55d6fd22e6b85c;hp=d16880f277aa77ad9da5d10d8630340be3957c5a;hb=0b7af9456fb564df73d32ff7712200d14569a375;hpb=c76133340787e9dd20ce56fdb9a5a6f4cbfe0067 diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul index d16880f27..f9f244b61 100755 --- a/tests/regression/ust/java-jul/test_java_jul +++ b/tests/regression/ust/java-jul/test_java_jul @@ -27,7 +27,7 @@ TESTAPP_PATH="$CURDIR/$TESTAPP_NAME" SESSION_NAME="jul" EVENT_NAME="JTestLTTng" EVENT_NAME2="JTestLTTng2" -JAVA_CP="$CURDIR:/usr/local/share/java/liblttng-ust-agent.jar:/usr/share/java/liblttng-ust-agent.jar" +JAVA_CP="$CURDIR:$CLASSPATH" NUM_TESTS=155 @@ -38,7 +38,8 @@ 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="$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $finest_tp $fire_second_tp >/dev/null 2>&1 } function run_app_background @@ -89,22 +90,28 @@ 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_ok $SESSION_NAME - 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 + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $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 @@ -117,15 +124,15 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting all events. trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH @@ -138,15 +145,15 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting all events. trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH @@ -156,15 +163,15 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting 0 events. trace_match_only $EVENT_NAME 0 $TRACE_PATH @@ -174,15 +181,15 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting all events. trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH @@ -193,16 +200,16 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting all events times two. trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH @@ -210,16 +217,16 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting all events times two. trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH @@ -232,21 +239,21 @@ 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 - stop_lttng_tracing $SESSION_NAME-1 - stop_lttng_tracing $SESSION_NAME-2 - destroy_lttng_session $SESSION_NAME-1 - destroy_lttng_session $SESSION_NAME-2 + stop_lttng_tracing_ok $SESSION_NAME-1 + stop_lttng_tracing_ok $SESSION_NAME-2 + destroy_lttng_session_ok $SESSION_NAME-1 + destroy_lttng_session_ok $SESSION_NAME-2 # Expecting 6 events being the main event plus the second tp. trace_match_only $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1 @@ -265,23 +272,23 @@ 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 - stop_lttng_tracing $SESSION_NAME-1 - stop_lttng_tracing $SESSION_NAME-2 - destroy_lttng_session $SESSION_NAME-1 - destroy_lttng_session $SESSION_NAME-2 + stop_lttng_tracing_ok $SESSION_NAME-1 + stop_lttng_tracing_ok $SESSION_NAME-2 + destroy_lttng_session_ok $SESSION_NAME-1 + destroy_lttng_session_ok $SESSION_NAME-2 # Validate test. Expecting one event of the second TP. trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-1 @@ -300,23 +307,23 @@ 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 - stop_lttng_tracing $SESSION_NAME-1 - stop_lttng_tracing $SESSION_NAME-2 - destroy_lttng_session $SESSION_NAME-1 - destroy_lttng_session $SESSION_NAME-2 + stop_lttng_tracing_ok $SESSION_NAME-1 + stop_lttng_tracing_ok $SESSION_NAME-2 + destroy_lttng_session_ok $SESSION_NAME-1 + destroy_lttng_session_ok $SESSION_NAME-2 # Validate test. Expecting NO event of the first TP. trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1 @@ -335,19 +342,19 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting NO event of the first TP and second TP. trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME @@ -361,21 +368,21 @@ 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 - stop_lttng_tracing $SESSION_NAME-1 - stop_lttng_tracing $SESSION_NAME-2 - destroy_lttng_session $SESSION_NAME-1 - destroy_lttng_session $SESSION_NAME-2 + stop_lttng_tracing_ok $SESSION_NAME-1 + stop_lttng_tracing_ok $SESSION_NAME-2 + destroy_lttng_session_ok $SESSION_NAME-1 + destroy_lttng_session_ok $SESSION_NAME-2 # Validate test. Expecting all events of first TP trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1 @@ -394,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 @@ -404,8 +411,8 @@ function test_jul_destroy_session() # Wait for the applications started in background wait - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting at least one event num 1 validate_trace $EVENT_NAME $TRACE_PATH/first-sess @@ -413,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 @@ -423,8 +430,8 @@ function test_jul_destroy_session() # Wait for the applications started in background wait - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting only one event num 2 trace_match_only $EVENT_NAME2 1 $TRACE_PATH/second-sess @@ -437,16 +444,16 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting one event of the second TP only. trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME @@ -454,17 +461,17 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting NR_ITER event of the main INFO tp. trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME @@ -477,18 +484,18 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting one event of the second TP only. trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME @@ -501,18 +508,18 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting NR_ITER event of the main INFO tp. trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME @@ -529,18 +536,18 @@ 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 - stop_lttng_tracing $SESSION_NAME - destroy_lttng_session $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + destroy_lttng_session_ok $SESSION_NAME # Validate test. Expecting no events. trace_match_only $ALL_EVENTS 0 $TRACE_PATH/$SESSION_NAME