Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / tools / wildcard / test_event_wildcard

diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard
index 0bf2d2c2c1bf56aae11db4add11891ff2e3979c9..c226461753b919759adc51239dbe614c998b8523 100755 (executable)
--- a/tests/regression/tools/wildcard/test_event_wildcard
+++ b/tests/regression/tools/wildcard/test_event_wildcard
@@ -35,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"
@@ -69,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"
 
@@ -85,6 +85,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 
 diag "Test UST wildcard"
@@ -167,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