X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-log4j%2Ftest_java_log4j;h=ed4302879e5ac183f3de1b2e2d987773846e3ce1;hp=cdc0c4c34470c6751da5b9ebdfbc9af62c975825;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hpb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00 diff --git a/tests/regression/ust/java-log4j/test_java_log4j b/tests/regression/ust/java-log4j/test_java_log4j index cdc0c4c34..ed4302879 100755 --- a/tests/regression/ust/java-log4j/test_java_log4j +++ b/tests/regression/ust/java-log4j/test_java_log4j @@ -1,19 +1,8 @@ #!/bin/bash # -# Copyright (C) - 2014 David Goulet +# Copyright (C) 2014 David Goulet # -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License, version 2 only, as published by -# the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -# details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-only TEST_DESC="Java LOG4J support" @@ -27,10 +16,10 @@ TESTAPP_PATH="$CURDIR/$TESTAPP_NAME" SESSION_NAME="log4j" EVENT_NAME="log4j-event" EVENT_NAME2="log4j-event-2" -JAVA_CP="$CURDIR:/usr/local/share/java/liblttng-ust-agent.jar:/usr/share/java/*" +JAVA_CP="$CURDIR:$CLASSPATH" OUTPUT_DEST="/dev/null" -NUM_TESTS=155 +NUM_TESTS=195 source $TESTDIR/utils/utils.sh @@ -40,7 +29,7 @@ function run_app 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 + java -cp $JAVA_CP -Djava.library.path="$LD_LIBRARY_PATH:/usr/local/lib:/usr/lib" $TESTAPP_NAME $NR_ITER $NR_MSEC_WAIT $debug_tp $fire_second_tp >/dev/null 2>&1 } function run_app_background @@ -91,8 +80,8 @@ 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) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") diag "Test LOG4J application BEFORE tracing starts" create_lttng_session_ok $SESSION_NAME $TRACE_PATH @@ -339,6 +328,119 @@ function test_log4j_multi_session_disable_wildcard() fi } +function test_log4j_multi_session_disable_wildcard_begin() +{ + ev_name='*-event' + diag "Test LOG4J with multiple session with disabled wildcard (at the beginning) event" + + create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1 + enable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2 + enable_log4j_lttng_event $SESSION_NAME-2 "$ev_name" + + disable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + start_lttng_tracing_ok $SESSION_NAME-1 + start_lttng_tracing_ok $SESSION_NAME-2 + + run_app 0 1 + + 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 + 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_log4j_multi_session_disable_wildcard_middle() +{ + ev_name='log*nt' + diag "Test LOG4J with multiple session with disabled wildcard (at the middle) event" + + create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1 + enable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2 + enable_log4j_lttng_event $SESSION_NAME-2 "$ev_name" + + disable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + start_lttng_tracing_ok $SESSION_NAME-1 + start_lttng_tracing_ok $SESSION_NAME-2 + + run_app 0 1 + + 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 + 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_log4j_multi_session_disable_wildcard_end() +{ + ev_name='log4j-ev*' + diag "Test LOG4J with multiple session with disabled wildcard (at the end) event" + + create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1 + enable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2 + enable_log4j_lttng_event $SESSION_NAME-2 "$ev_name" + + disable_log4j_lttng_event $SESSION_NAME-1 "$ev_name" + + start_lttng_tracing_ok $SESSION_NAME-1 + start_lttng_tracing_ok $SESSION_NAME-2 + + run_app 0 1 + + 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 + if [ $? -ne 0 ]; then + return $? + fi + + # Validate test. Expecting all events of the first TP. + trace_matches $EVENT_NAME $(( $NR_ITER + 1 )) $TRACE_PATH/$SESSION_NAME-2 + if [ $? -ne 0 ]; then + return $? + fi + + trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2 + if [ $? -ne 0 ]; then + return $? + fi +} + function test_log4j_disable_all() { diag "Test LOG4J with multiple session with disabled all event" @@ -348,7 +450,7 @@ function test_log4j_disable_all() enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME enable_log4j_lttng_event $SESSION_NAME $EVENT_NAME2 - disable_log4j_lttng_event $SESSION_NAME '*' + disable_log4j_lttng_event $SESSION_NAME -a start_lttng_tracing_ok $SESSION_NAME @@ -559,6 +661,8 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +bail_out_if_no_babeltrace + if [ ! -f "$TESTAPP_PATH.class" ]; then withapp=0 else @@ -571,6 +675,9 @@ skip $withapp "LOG4J support is needed. Skipping all tests." $NUM_TESTS || tests=( test_log4j_multi_session_disable_wildcard + test_log4j_multi_session_disable_wildcard_begin + test_log4j_multi_session_disable_wildcard_middle + test_log4j_multi_session_disable_wildcard_end test_log4j_multi_session_disable test_log4j_disable test_log4j_disable_enable @@ -588,7 +695,7 @@ skip $withapp "LOG4J support is needed. Skipping all tests." $NUM_TESTS || for fct_test in ${tests[@]}; do - TRACE_PATH=$(mktemp -d) + TRACE_PATH=$(mktemp --tmpdir -d tmp.test_java_log4j_trace_path.XXXXXX) ${fct_test} if [ $? -ne 0 ]; then