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

diff --git a/tests/regression/ust/overlap/test_overlap b/tests/regression/ust/overlap/test_overlap
index 7a39332af..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()
@@ -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