X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Foverlap%2Ftest_overlap;h=69d6c66d2979c99c98c51cd72e0dba3f8e65438e;hp=ca8efb34f098bb301129c3b90ab86ce3dffefc01;hb=de76faf845535b90c71a30b996b411348f81f6be;hpb=e5be53a084ca2d0fd6540c6da59fa8909dfac8f8

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index ca8efb34f..69d6c66d2 100755
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -1,24 +1,666 @@
 #!/bin/bash
+#
+# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; version 2.1 of the License.
+#
+# This library 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 Lesser General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this library; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+TEST_DESC="UST - Wildcard overlap"
 
-DIR=$(dirname $0)
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../../..
+SESSION_NAME="wildcard-overlap"
 
-tests=( $DIR/overlap.sh)
+DEMO_EVENT1="ust_tests_demo:starting"
+DEMO_EVENT1_2="ust_tests_demo:done"
+DEMO_EVENT2="ust_tests_demo2:loop"
+DEMO_EVENT3="ust_tests_demo3:done"
 
-exit_code=0
+NUM_DEMO1_EVENT=1
+NUM_DEMO1_2_EVENT=1
+NUM_DEMO2_EVENT=5
+NUM_DEMO3_EVENT=1
 
-function start_tests ()
+NUM_TESTS=259
+
+source $TESTDIR/utils/utils.sh
+
+if [ ! -x "$CURDIR/demo/demo" ]; then
+	BAIL_OUT "No UST nevents binary detected."
+fi
+
+# MUST set TESTDIR before calling those functions
+
+run_demo_app()
+{
+	cd $CURDIR/demo
+
+	# Start test
+	diag "Running application"
+	./demo-trace >/dev/null 2>&1
+	ok $? "Application done"
+
+	cd -
+}
+
+# Ease our life a bit ;)
+trace_match_demo1_events()
+{
+	trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" $NUM_DEMO1_EVENT $TRACE_PATH
+}
+
+# Ease our life a bit ;)
+trace_match_all_demo_events()
+{
+	trace_match_demo1_events
+	trace_matches "$DEMO_EVENT2" $NUM_DEMO2_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" $NUM_DEMO3_EVENT $TRACE_PATH
+}
+
+# Ease our life a bit ;)
+trace_match_no_demo_events()
+{
+	trace_matches "$DEMO_EVENT1" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_simple_wildcard()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Simple wildcard overlap"
+
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+
+	return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Wildcard overlap with filter"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_2()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Wildcard overlap with filter 2"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_3()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Wildcard overlap with filter 3"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: No events.
+test_enable_wildcard_filter_4()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Wildcard overlap with filter 4"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_wildcard_filter_5()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Wildcard overlap with filter 5"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expect all $DEMO_EVENT1 events, no duplicate.
+test_enable_wildcard_filter_6()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Wildcard overlap with filter 6"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+	return $?
+}
+
+# Expect all events, no duplicate.
+test_enable_wildcard_filter_7()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Wildcard overlap with filter 7"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: No events.
+test_enable_wildcard_filter_8()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Wildcard overlap with filter 8"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expect all events.
+test_enable_same_wildcard_filter()
 {
-    for bin in ${tests[@]};
-    do
-        ./$bin
-        # Test must return 0 to pass.
-        if [ $? -ne 0 ]; then
-            exit_code=1
-            break
-        fi
-    done
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Same wildcard overlap with filter"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
 }
 
-start_tests
+# Expect all events.
+test_enable_same_wildcard_filter_2()
+{
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Same wildcard overlap with filter 2"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+
+	# Enabling the same events with same filters should fail. This one is expected to fail.
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_wild2" -s $SESSION_NAME -u --filter "1==1" >/dev/null 2>&1
+	if [ $? -ne 0 ]; then
+	    pass "Enable event $event_name with filtering for session $sess_name twice failure detected"
+	else
+	    fail "Enable event $event_name with filtering for session $sess_name twice failure NOT detected"
+	fi
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expect all events.
+test_enable_same_wildcard_filter_3()
+{
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Same wildcard overlap with filter 3"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: No events.
+test_enable_same_wildcard_filter_4()
+{
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Same wildcard overlap with filter 4"
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expected: Only $DEMO_EVENT1
+test_enable_same_event_filter()
+{
+	local event_wild1="$DEMO_EVENT1"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Enable same event with filter."
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+	return $?
+}
+
+# Expected: No events.
+test_disable_same_wildcard_filter()
+{
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Disable same wildcard with filter."
+
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+
+	disable_ust_lttng_event $SESSION_NAME "ust*"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expect no events
+test_enable_bad_wildcard()
+{
+	# Invalid event
+	local event_wild1="ust_tests_demo"
+	local event_wild2="ust_tests_demo2"
+	local event_wild3="ust_tests_demo3"
+
+	diag "Enable bad wildcard"
+
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild3"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expect all "demo" events, no duplicate.
+test_enable_simple_wildcard_2()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Simple wildcard 2"
+
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: all CRIT events, + all warning events.
+test_enable_loglevel_overlap()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Enable loglevel overlap"
+
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: all CRIT events, + all warning events.
+test_enable_loglevel_only_overlap()
+{
+	local event_wild1="us*"
+	local event_wild2="ust*"
+
+	diag "Enable loglevel only overlap"
+
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+	enable_ust_lttng_event_loglevel_only $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected: all events
+test_enable_loglevel_overlap_2()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT2"
+
+	diag "Enable loglevel overlap 2"
+
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_WARNING"
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_CRIT"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected only ust_tests_demo* events.
+test_enable_same_wildcard_loglevels()
+{
+	local event_wild1="ust*"
+	local event_wild2="ust*"
+
+	diag "Enable same wildcard with different loglevels"
+
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_match_all_demo_events
+	return $?
+}
+
+# Expected only ust_tests_demo:starting events.
+test_enable_same_event_loglevels()
+{
+	local event_wild1="$DEMO_EVENT1"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Enable same event with different loglevels"
+
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild1" "TRACE_CRIT"
+	enable_ust_lttng_event_loglevel $SESSION_NAME "$event_wild2" "TRACE_WARNING"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT2 0 $TRACE_PATH
+	trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+	return $?
+}
+
+# Expect 0 event
+test_disable_simple_wildcard()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Disable simple wildcard"
+
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+
+	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	disable_ust_lttng_event $SESSION_NAME "$event_wild2"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	# No events are expected.
+	trace_match_no_demo_events
+	return $?
+}
+
+# Expect only "ust_tests_demo" events.
+test_disable_wildcard_overlap()
+{
+	local event_wild1="us*"
+	local event_wild2="$DEMO_EVENT1"
+
+	diag "Disable wildcard overlap"
+
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
+
+	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
+
+	start_lttng_tracing_ok $SESSION_NAME
+
+	run_demo_app
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	# Expect only "ust_tests_demo" events.
+	trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
+	return $?
+}
+
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
+TESTS=(
+	"test_enable_wildcard_filter"
+	"test_enable_wildcard_filter_2"
+	"test_enable_wildcard_filter_3"
+	"test_enable_wildcard_filter_4"
+	"test_enable_wildcard_filter_5"
+	"test_enable_wildcard_filter_6"
+	"test_enable_wildcard_filter_7"
+	"test_enable_wildcard_filter_8"
+	"test_enable_same_wildcard_filter"
+	"test_enable_same_wildcard_filter_2"
+	"test_enable_same_wildcard_filter_3"
+	"test_enable_same_wildcard_filter_4"
+	"test_enable_same_event_filter"
+	"test_enable_loglevel_only_overlap"
+	"test_enable_same_event_loglevels"
+	"test_enable_same_wildcard_loglevels"
+	"test_enable_bad_wildcard"
+	"test_enable_loglevel_overlap_2"
+	"test_enable_simple_wildcard"
+	"test_enable_simple_wildcard_2"
+	"test_enable_loglevel_overlap"
+	"test_disable_simple_wildcard"
+	"test_disable_wildcard_overlap"
+)
+
+TEST_COUNT=${#TESTS[@]}
+i=0
+
+start_lttng_sessiond
+
+while [ "$i" -lt "$TEST_COUNT" ]; do
+
+	TRACE_PATH=$(mktemp -d)
+
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+
+	# Execute test
+	${TESTS[$i]}
+
+	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf $TRACE_PATH
+
+	let "i++"
+done
 
-exit $exit_code
+stop_lttng_sessiond