Fix: lttng-snapshot: use after free of max size argument
[lttng-tools.git] / tests / regression / ust / java-jul / test_java_jul
index 0baa287038ccf614e169f26621c5cde43a87f099..90c1758e1131fabbf68ad5cba1e87bd1f353d207 100755 (executable)
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 David Goulet <dgoulet@efficios.com>
 #
-# 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 JUL support"
 
@@ -27,9 +16,9 @@ TESTAPP_PATH="$CURDIR/$TESTAPP_NAME"
 SESSION_NAME="jul"
 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"
+JAVA_CP="$CURDIR:$CLASSPATH"
 
-NUM_TESTS=106
+NUM_TESTS=195
 
 source $TESTDIR/utils/utils.sh
 
@@ -38,15 +27,13 @@ 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 wait_apps
+function run_app_background
 {
-       while [ -n "$(pidof java)" ]; do
-               sleep 0.5
-       done
-       pass "Wait for applications to end"
+       run_app $@ &
 }
 
 function enable_jul_loglevel_only()
@@ -77,26 +64,46 @@ function enable_jul_filter()
        ok $? "Enable event $event_name with filter $filter for session $sess_name"
 }
 
+function enable_jul_filter_loglevel_only()
+{
+       local sess_name="$1"
+       local event_name="$2"
+       local filter="$3"
+       local loglevel="$4"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel-only $loglevel "$event_name" -s $sess_name -j --filter "$filter" >/dev/null 2>&1
+       ok $? "Enable event $event_name with filter \"$filter\" and loglevel-only $loglevel for session $sess_name"
+}
+
 # MUST set TESTDIR before calling those functions
 
 function test_jul_before_start ()
 {
+       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 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
+       run_app_background
 
-       start_lttng_tracing $SESSION_NAME
+       start_lttng_tracing_ok $SESSION_NAME
 
-       wait_apps
+       touch ${file_sync_before_last}
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       # Wait for the applications started in background
+       wait
+
+       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_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -106,20 +113,18 @@ 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
 
-       wait_apps
-
-       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_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -129,60 +134,54 @@ 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
 
-       wait_apps
-
-       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_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
        if [ $? -ne 0 ]; then
                return $?
        fi
 
        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
 
-       wait_apps
-
-       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_matches $EVENT_NAME 0 $TRACE_PATH
+       trace_match_only $EVENT_NAME 0 $TRACE_PATH
        if [ $? -ne 0 ]; then
                return $?
        fi
 
        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
 
-       wait_apps
-
-       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_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
        return $?
 }
 
@@ -190,38 +189,36 @@ 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
-       wait_apps
 
-       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_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+       trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
        if [ $? -ne 0 ]; then
                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
-       wait_apps
 
-       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_matches $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
+       trace_match_only $EVENT_NAME $(($NR_ITER * 2)) $TRACE_PATH
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -231,31 +228,239 @@ 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
-       wait_apps
 
-       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_matches $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
+       trace_match_only $EVENT_NAME $(($NR_ITER + 1)) $TRACE_PATH/$SESSION_NAME-1
        if [ $? -ne 0 ]; then
                return $?
        fi
 
        # Expectin 5 events being the finest TP.
-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-2
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_multi_session_disable()
+{
+       diag "Test JUL with multiple session with disabled event"
+
+       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_ok $SESSION_NAME-1
+
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       enable_jul_lttng_event $SESSION_NAME-2 $EVENT_NAME2
+       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_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
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+
+       # Validate test. Expecting one event of the second TP.
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_multi_session_disable_wildcard()
+{
+       diag "Test JUL with multiple session with disabled wildcard event"
+
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       enable_jul_lttng_event $SESSION_NAME-1 '*'
+
+       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_ok $SESSION_NAME-1
+       start_lttng_tracing_ok $SESSION_NAME-2
+
+       run_app
+
+       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_jul_multi_session_disable_wildcard_begin()
+{
+       ev_name='*LTTng'
+       diag "Test JUL with multiple session with disabled wildcard (at the beginning) event"
+
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+       disable_jul_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_jul_multi_session_disable_wildcard_middle()
+{
+       ev_name='J*LTTng'
+       diag "Test JUL with multiple session with disabled wildcard (at the middle) event"
+
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+       disable_jul_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_jul_multi_session_disable_wildcard_end()
+{
+       ev_name='JTestLTT*'
+       diag "Test JUL with multiple session with disabled wildcard (at the end) event"
+
+       create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH/$SESSION_NAME-1
+       enable_jul_lttng_event $SESSION_NAME-1 "$ev_name"
+
+       create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH/$SESSION_NAME-2
+       enable_jul_lttng_event $SESSION_NAME-2 "$ev_name"
+
+       disable_jul_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_jul_disable_all()
+{
+       diag "Test JUL with multiple session with disabled all event"
+
+       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 -a
+
+       start_lttng_tracing_ok $SESSION_NAME
+
+       run_app 0 1
+
+       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
+       trace_match_only $EVENT_NAME2 0 $TRACE_PATH/$SESSION_NAME
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -265,31 +470,30 @@ 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
-       wait_apps
 
-       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_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME-1
        if [ $? -ne 0 ]; then
                return $?
        fi
 
        # Validate test. Expecting one event of the second TP.
-       trace_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME-2
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -299,17 +503,18 @@ 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 0 1
+       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
+       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
@@ -317,17 +522,21 @@ 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
 
-       wait_apps
+       # Run 5 times with a 1 second delay
+       run_app_background 0 1
 
-       stop_lttng_tracing $SESSION_NAME
-       destroy_lttng_session $SESSION_NAME
+       # Wait for the applications started in background
+       wait
+
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test. Expecting only one event num 2
-       trace_matches $EVENT_NAME2 1 $TRACE_PATH/second-sess
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/second-sess
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -337,39 +546,113 @@ 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
-       wait_apps
 
-       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_matches $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
+       trace_match_only $EVENT_NAME2 1 $TRACE_PATH/$SESSION_NAME
        if [ $? -ne 0 ]; then
                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
-       wait_apps
 
-       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
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_disable()
+{
+       diag "Test JUL disable event"
+
+       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_ok $SESSION_NAME
+
+       # Run 5 times with a 1 second delay and fire second TP.
+       run_app 0 1
+
+       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
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_disable_enable()
+{
+       diag "Test JUL disable event followed by an enable"
+
+       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_ok $SESSION_NAME
+
+       # Run 5 times with a 1 second delay and fire second TP.
+       run_app 0 1
+
+       stop_lttng_tracing_ok $SESSION_NAME
+       destroy_lttng_session_ok $SESSION_NAME
 
        # Validate test. Expecting NR_ITER event of the main INFO tp.
-       trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+       trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH/$SESSION_NAME
+       if [ $? -ne 0 ]; then
+               return $?
+       fi
+}
+
+function test_jul_filter_loglevel()
+{
+       local BOGUS_EVENT_NAME="not_a_real_event"
+       local FILTER="int_loglevel > 700 || int_loglevel < 700"
+       local ALL_EVENTS="."
+
+       diag "Test JUL a filter with a loglevel"
+
+       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_ok $SESSION_NAME
+
+       # Run 5 times with a 1 second delay and fire second TP.
+       run_app 0 1
+
+       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
        if [ $? -ne 0 ]; then
                return $?
        fi
@@ -379,6 +662,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 if [ ! -f "$TESTAPP_PATH.class" ]; then
        withapp=0
 else
@@ -390,6 +675,14 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
        start_lttng_sessiond
 
        tests=(
+               test_jul_multi_session_disable_wildcard_begin
+               test_jul_multi_session_disable_wildcard_middle
+               test_jul_multi_session_disable_wildcard_end
+               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
@@ -398,11 +691,12 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
                test_jul_before_start
                test_jul_after_start
                test_jul_multi_session
+               test_jul_filter_loglevel
        )
 
        for fct_test in ${tests[@]};
        do
-               TRACE_PATH=$(mktemp -d)
+               TRACE_PATH=$(mktemp --tmpdir -d tmp.test_java_jul_trace_path.XXXXXX)
 
                ${fct_test}
                if [ $? -ne 0 ]; then
This page took 0.049326 seconds and 4 git commands to generate.