X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fwildcard%2Ftest_event_wildcard;h=c226461753b919759adc51239dbe614c998b8523;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=61ea67a72b3eb8b27ff600d773cd554e188c6fb2;hpb=4d513dce5d26cbc477a00b348beb537d01231cd9;p=lttng-tools.git

diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard
index 61ea67a72..c22646175 100755
--- a/tests/regression/tools/wildcard/test_event_wildcard
+++ b/tests/regression/tools/wildcard/test_event_wildcard
@@ -1,20 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-# Copyright (C) - 2015 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2015 Mathieu Desnoyers <mathieu.desnoyers@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="LTTng - Event wildcard test"
 
@@ -25,6 +14,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="wildcard"
 NR_ITER=100
+NR_USEC_WAIT=1
 NUM_GLOBAL_TESTS=2
 NUM_UST_TESTS=$(( 7 * 25 ))
 NUM_KERNEL_TESTS=$(( 7 * 25 ))
@@ -34,7 +24,7 @@ source $TESTDIR/utils/utils.sh
 
 function run_ust
 {
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
 }
 
 function run_kernel
@@ -45,7 +35,7 @@ function run_kernel
 
 function test_event_wildcard()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	DOMAIN="$1"
 	FIND="$2"
 	WILDCARD="$3"
@@ -79,7 +69,7 @@ function test_event_wildcard()
 
 function test_event_wildcard_fail()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	DOMAIN="$1"
 	WILDCARD="$2"
 
@@ -95,6 +85,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 
 diag "Test UST wildcard"
@@ -177,7 +169,7 @@ skip $isroot "Root access is needed. Skipping all kernel wildcard tests." $NUM_K
 	test_event_wildcard kernel 1 'lttng*test*filter*event'
 	test_event_wildcard kernel 1 '*lttng*test*filter*event*'
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 }
 
 stop_lttng_sessiond