X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fwildcard%2Ftest_event_wildcard;h=8777424196e52169f02679e929d88bcbd2104e2e;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=36d56cd3e596571cd4115d0e00ea085f0ec5d56f;hpb=d0e263e7e628d2eba76c883ffc6fb92065e440c7;p=lttng-tools.git

diff --git a/tests/regression/tools/wildcard/test_event_wildcard b/tests/regression/tools/wildcard/test_event_wildcard
index 36d56cd3e..877742419 100755
--- 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 -d -t "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 -d -t "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"
@@ -124,13 +126,7 @@ test_event_wildcard ust 1 'tp*tptest'
 test_event_wildcard ust 1 'tp**tptest'
 test_event_wildcard ust 1 'tp*test'
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel wildcard tests." $NUM_KERNEL_TESTS ||
+check_skip_kernel_test "$NUM_KERNEL_TESTS" "Skipping kernel wildcard tests." ||
 {
 	diag "Test kernel wildcards"