X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fexclusion%2Ftest_exclusion;h=1bfb63533761fed9c042b63ba7f87daf1f837419;hp=d295535828831a6086d86e6c25d6cb2fa412ef79;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hpb=afa7d3f1c0fae5ab6acb5e2fff3eaaa5558d6743

diff --git a/tests/regression/tools/exclusion/test_exclusion b/tests/regression/tools/exclusion/test_exclusion
index d29553582..1bfb63533 100755
--- a/tests/regression/tools/exclusion/test_exclusion
+++ b/tests/regression/tools/exclusion/test_exclusion
@@ -16,7 +16,7 @@ TESTAPP_NAME="gen-ust-nevents"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 NR_ITER=100
 NR_USEC_WAIT=1
-NUM_TESTS=178
+NUM_TESTS=185
 
 source $TESTDIR/utils/utils.sh
 
@@ -25,12 +25,12 @@ function enable_ust_lttng_all_event_exclusion()
 	sess_name="$1"
 	exclusion="$2"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event -u "tp:*" -s $sess_name -x "$exclusion"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event -u "tp:*" -s $sess_name -x "$exclusion" > /dev/null
 }
 
 function run_apps
 {
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+	$TESTAPP_BIN --iter $NR_ITER --wait $NR_USEC_WAIT >/dev/null 2>&1
 	ok $? "Running test application"
 }
 
@@ -40,7 +40,7 @@ function run_apps
 # of our test suite to generate events.
 function dry_run
 {
-	trace_path=$(mktemp -d)
+	local trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	# Create session
 	create_lttng_session_ok $SESSION_NAME $trace_path
@@ -68,9 +68,9 @@ function dry_run
 
 function test_exclusion
 {
-	exclusions="$1"
-	event_name_expected_to_be_missing="$2"
-	trace_path=$(mktemp -d)
+	local exclusions="$1"
+	local event_name_expected_to_be_missing="$2"
+	local trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 
 	# Create session
 	create_lttng_session_ok $SESSION_NAME $trace_path
@@ -95,6 +95,59 @@ function test_exclusion
 	fi
 }
 
+function test_exclusion_tracing_started
+{
+	local exclusions="$1"
+	local event_name_expected_to_be_missing="$2"
+	local trace_path=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local file_wait_before_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_first.XXXXXX")
+	local file_create_in_main=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_create_in_main.XXXXXX")
+
+	# Create session
+	create_lttng_session_ok $SESSION_NAME $trace_path
+
+	# Enable a dummy event so that the session is active after we start the
+	# session.
+	enable_ust_lttng_event_ok $SESSION_NAME "non-existent-event"
+
+	# Start the tracing
+	start_lttng_tracing_ok $SESSION_NAME
+
+	# Launch the test app and make it create a sync file once it's in the
+	# main function.
+	$TESTAPP_BIN -i 1 -w 10000 \
+		--create-in-main ${file_create_in_main} \
+		--wait-before-first-event ${file_wait_before_first} 2>&1 &
+
+	while [ ! -f "${file_create_in_main}" ]; do
+		sleep 0.5
+	done
+
+	# Enable an event with an exclusion once the tracing is active in the
+	# UST app.
+	enable_ust_lttng_all_event_exclusion $SESSION_NAME "$exclusions"
+	ok $? "Enable lttng event with event \"$exclusions\" excluded"
+
+	# Create the sync file so that the test app starts generating events.
+	touch ${file_wait_before_first}
+
+	# Wait for the testapp to finish.
+	wait
+
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	# Destroy session
+	destroy_lttng_session_ok $SESSION_NAME
+
+	stats=$(babeltrace $trace_path | $STATS_BIN --tracepoint "$event_name_expected_to_be_missing" | grep -v index 2> /dev/null)
+	if [ ! -z "$stats" ]; then
+		fail "Excluded event \"$event_name_expected_to_be_missing\" was found in trace!"
+	else
+		ok 0 "Validate trace exclusion output"
+		rm -rf $trace_path
+	fi
+}
+
 function test_exclusion_fail
 {
 	event_name="$1"
@@ -116,12 +169,14 @@ function test_exclusion_fail
 
 plan_tests $NUM_TESTS
 
-print_test_banner $TEST_DESC
+print_test_banner "$TEST_DESC"
 
 start_lttng_sessiond
 
+diag "Enable event without exclusion"
 dry_run
 
+diag "Enable event with exclusion"
 test_exclusion 'tp:tptest2' 'tp:tptest2'
 test_exclusion 'tp:tptest3' 'tp:tptest3'
 test_exclusion 'tp:tptest*' 'tp:tptest1'
@@ -145,12 +200,14 @@ test_exclusion '*3' 'tp:tptest3'
 test_exclusion 'tp*test3,*2' 'tp:tptest2'
 test_exclusion '**tp*test3,*2' 'tp:tptest3'
 
-# Cannot use exclusions with non-globbing event name
+test_exclusion_tracing_started 'tp:tptest1' 'tp:tptest1'
+
+diag "Cannot use exclusions with non-globbing event name"
 test_exclusion_fail "allo" "lol"
 test_exclusion_fail "allo" "meow,lol"
 test_exclusion_fail "allo" "z*em"
 
-# Exclusion name excludes all possible event names
+diag "Exclusion name excludes all possible event names"
 test_exclusion_fail "allo*" "all*"
 test_exclusion_fail "allo*" "ze,all*,yes"