X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Foverlap%2Ftest_overlap;h=c399c688d075431149a617bd060f615344680e94;hp=ab853f31ae7b4927ccfa488bcab1ff9c6283d4ab;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index ab853f31a..c399c688d 100755
--- a/tests/regression/ust/overlap/test_overlap
+++ b/tests/regression/ust/overlap/test_overlap
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# 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
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="UST - Wildcard overlap"
 
 CURDIR=$(dirname $0)/
@@ -34,10 +24,6 @@ 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()
@@ -87,11 +73,11 @@ test_enable_simple_wildcard()
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 
@@ -109,11 +95,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -130,11 +116,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -151,11 +137,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -172,11 +158,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_no_demo_events
 	return $?
@@ -193,11 +179,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -214,11 +200,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
 	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -238,11 +224,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -259,11 +245,11 @@ test_enable_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_no_demo_events
 	return $?
@@ -280,11 +266,11 @@ test_enable_same_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -308,11 +294,11 @@ test_enable_same_wildcard_filter_2()
 	    fail "Enable event $event_name with filtering for session $sess_name twice failure NOT detected"
 	fi
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -329,11 +315,11 @@ test_enable_same_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -350,11 +336,11 @@ test_enable_same_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_no_demo_events
 	return $?
@@ -371,11 +357,11 @@ test_enable_same_event_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
 	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -397,11 +383,11 @@ test_disable_same_wildcard_filter()
 
 	disable_ust_lttng_event $SESSION_NAME "ust*"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_no_demo_events
 	return $?
@@ -421,11 +407,11 @@ test_enable_bad_wildcard()
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild3"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_no_demo_events
 	return $?
@@ -442,11 +428,11 @@ test_enable_simple_wildcard_2()
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild1"
 	enable_ust_lttng_event_ok $SESSION_NAME "$event_wild2"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -463,11 +449,11 @@ test_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -484,11 +470,11 @@ test_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -505,11 +491,11 @@ test_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -526,11 +512,11 @@ test_enable_same_wildcard_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_match_all_demo_events
 	return $?
@@ -547,11 +533,11 @@ test_enable_same_event_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 $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
 	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
@@ -574,11 +560,11 @@ test_disable_simple_wildcard()
 	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 	disable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	# No events are expected.
 	trace_match_no_demo_events
@@ -598,11 +584,11 @@ test_disable_wildcard_overlap()
 
 	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	run_demo_app
 
-	stop_lttng_tracing $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
 
 	# Expect only "ust_tests_demo" events.
 	trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
@@ -616,6 +602,14 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+if [ -x "$CURDIR/demo/demo" ]; then
+	foundbin=1
+else
+	foundbin=0
+fi
+
+skip $foundbin "No UST nevents binary detected. Skipping all tests." $NUM_TESTS && exit 0
+
 TESTS=(
 	"test_enable_wildcard_filter"
 	"test_enable_wildcard_filter_2"
@@ -656,7 +650,7 @@ while [ "$i" -lt "$TEST_COUNT" ]; do
 	# Execute test
 	${TESTS[$i]}
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH