From 958d2529185658ad78c2bcf18818a40859a6c076 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Fri, 5 Sep 2014 12:16:18 -0400 Subject: [PATCH] Test: add disable-event JUL tests Signed-off-by: David Goulet --- tests/regression/ust/java-jul/test_java_jul | 65 ++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul index 6c888eb8f..b092e412f 100755 --- a/tests/regression/ust/java-jul/test_java_jul +++ b/tests/regression/ust/java-jul/test_java_jul @@ -29,7 +29,7 @@ EVENT_NAME="JTestLTTng" EVENT_NAME2="JTestLTTng2" JAVA_CP="$CURDIR:/usr/local/lib/lttng/java/liblttng-ust-jul.jar:/usr/lib/lttng/java/liblttng-ust-jul.jar" -NUM_TESTS=131 +NUM_TESTS=155 source $TESTDIR/utils/utils.sh @@ -294,6 +294,67 @@ function test_jul_multi_session_disable() fi } +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 + enable_jul_lttng_event $SESSION_NAME-1 '*' + + create_lttng_session $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 + + 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 + + # Validate test. Expecting NO event of the first TP. + trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME-1 + if [ $? -ne 0 ]; then + return $? + fi + + # Validate test. Expecting all events of the first TP. + trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2 + if [ $? -ne 0 ]; then + return $? + fi +} + +function test_jul_disable_all() +{ + diag "Test JUL with multiple session with disabled all event" + + create_lttng_session $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 + + run_app 0 1 + + stop_lttng_tracing $SESSION_NAME + destroy_lttng_session $SESSION_NAME + + # Validate test. Expecting NO event of the first TP and second TP. + trace_match_only $EVENT_NAME 0 $TRACE_PATH/$SESSION_NAME + trace_match_only $EVENT_NAME2 0 $TRACE_PATH/$SESSION_NAME + if [ $? -ne 0 ]; then + return $? + fi +} + function test_jul_multi_session() { diag "Test JUL with multiple session" @@ -497,9 +558,11 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS || start_lttng_sessiond tests=( + test_jul_multi_session_disable_wildcard test_jul_multi_session_disable test_jul_disable test_jul_disable_enable + test_jul_disable_all test_jul_filtering test_jul_multi_session_loglevel test_jul_destroy_session -- 2.34.1