X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fjava-jul%2Ftest_java_jul;h=90c1758e1131fabbf68ad5cba1e87bd1f353d207;hp=f4114fbe004e05609e6a395198d0126315a5a621;hb=HEAD;hpb=96340a015194538227efcbc654ec02c2ed9961ce

diff --git a/tests/regression/ust/java-jul/test_java_jul b/tests/regression/ust/java-jul/test_java_jul
index f4114fbe0..41e2656ff 100755
--- a/tests/regression/ust/java-jul/test_java_jul
+++ b/tests/regression/ust/java-jul/test_java_jul
@@ -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/share/java/liblttng-ust-agent.jar:/usr/share/java/liblttng-ust-agent.jar"
+JAVA_CP="$CURDIR:$CLASSPATH"
 
-NUM_TESTS=155
+NUM_TESTS=195
 
 source $TESTDIR/utils/utils.sh
 
@@ -39,7 +28,7 @@ function run_app
 	local fire_second_tp=$2
 
 	#FIXME: app should have synchro.
-	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
+	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
@@ -90,8 +79,8 @@ 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)
+	local file_sync_after_first=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test JUL application BEFORE tracing starts"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -108,7 +97,7 @@ function test_jul_before_start ()
 	wait
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -f ${file_sync_after_first}
 	rm -f ${file_sync_before_last}
@@ -132,7 +121,7 @@ function test_jul_after_start ()
 	run_app
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test. Expecting all events.
 	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
@@ -153,7 +142,7 @@ function test_jul_loglevel ()
 	run_app
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test. Expecting all events.
 	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
@@ -171,7 +160,7 @@ function test_jul_loglevel ()
 	run_app
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test. Expecting 0 events.
 	trace_match_only $EVENT_NAME 0 $TRACE_PATH
@@ -189,7 +178,7 @@ function test_jul_loglevel ()
 	run_app
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test. Expecting all events.
 	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
@@ -209,7 +198,7 @@ function test_jul_loglevel_multiple ()
 	run_app 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -226,7 +215,7 @@ function test_jul_loglevel_multiple ()
 	run_app 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -252,8 +241,8 @@ function test_jul_multi_session_loglevel()
 
 	stop_lttng_tracing_ok $SESSION_NAME-1
 	stop_lttng_tracing_ok $SESSION_NAME-2
-	destroy_lttng_session $SESSION_NAME-1
-	destroy_lttng_session $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
@@ -287,8 +276,8 @@ function test_jul_multi_session_disable()
 
 	stop_lttng_tracing_ok $SESSION_NAME-1
 	stop_lttng_tracing_ok $SESSION_NAME-2
-	destroy_lttng_session $SESSION_NAME-1
-	destroy_lttng_session $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
@@ -322,8 +311,80 @@ function test_jul_multi_session_disable_wildcard()
 
 	stop_lttng_tracing_ok $SESSION_NAME-1
 	stop_lttng_tracing_ok $SESSION_NAME-2
-	destroy_lttng_session $SESSION_NAME-1
-	destroy_lttng_session $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
@@ -338,6 +399,47 @@ function test_jul_multi_session_disable_wildcard()
 	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"
@@ -347,14 +449,14 @@ function test_jul_disable_all()
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME
 	enable_jul_lttng_event $SESSION_NAME $EVENT_NAME2
 
-	disable_jul_lttng_event $SESSION_NAME '*'
+	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 $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
@@ -381,8 +483,8 @@ function test_jul_multi_session()
 
 	stop_lttng_tracing_ok $SESSION_NAME-1
 	stop_lttng_tracing_ok $SESSION_NAME-2
-	destroy_lttng_session $SESSION_NAME-1
-	destroy_lttng_session $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
@@ -412,7 +514,7 @@ function test_jul_destroy_session()
 	wait
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -431,7 +533,7 @@ function test_jul_destroy_session()
 	wait
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -453,7 +555,7 @@ function test_jul_filtering()
 	run_app 0 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -471,7 +573,7 @@ function test_jul_filtering()
 	run_app 1 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -495,7 +597,7 @@ function test_jul_disable()
 	run_app 0 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -519,7 +621,7 @@ function test_jul_disable_enable()
 	run_app 0 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $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
@@ -547,7 +649,7 @@ function test_jul_filter_loglevel()
 	run_app 0 1
 
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Validate test. Expecting no events.
 	trace_match_only $ALL_EVENTS 0 $TRACE_PATH/$SESSION_NAME
@@ -560,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
@@ -571,6 +675,9 @@ 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
@@ -589,7 +696,7 @@ skip $withapp "JUL support is needed. Skipping all tests." $NUM_TESTS ||
 
 	for fct_test in ${tests[@]};
 	do
-		TRACE_PATH=$(mktemp -d)
+		TRACE_PATH=$(mktemp -d -t tmp.test_java_jul_trace_path.XXXXXX)
 
 		${fct_test}
 		if [ $? -ne 0 ]; then