X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=1d7b0db4726c25be78c1ab94b2cbd8a23636eb26;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=e76ffa25f2480998be378929cda20ef9dde369a4;hpb=33e557114a2ba28e26e220a833e8a449c78b8b65;p=lttng-tools.git

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index e76ffa25f..1d7b0db47 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -94,7 +94,7 @@ function test_valid_filter
 	event_name="$3"
 	filter="$4"
 	validator="$5"
-	local trace_path=$(mktemp --tmpdir -d tmp.test_filtering_invalid_filters_trace_path.XXXXXX)
+	local trace_path=$(mktemp -d -t tmp.test_filtering_valid_filters_trace_path.XXXXXX)
 
 	diag "Test valid $domain_name filter: $filter"
 
@@ -110,9 +110,9 @@ function test_valid_filter
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	# Destroy session
-	destroy_lttng_session_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME --no-wait
 
-	stats=`babeltrace $trace_path | $STATS_BIN --tracepoint $event_name`
+	stats=`"$BABELTRACE_BIN" $trace_path | $STATS_BIN --tracepoint $event_name`
 
 	rm -rf $trace_path
 
@@ -401,6 +401,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 issue_356_filter="intfield > 0 && intfield > 1 && "
 issue_356_filter+="intfield > 2 && intfield > 3 && "
 issue_356_filter+="intfield > 4 && intfield > 5 && "
@@ -1452,13 +1454,7 @@ KERNEL_FILTERS=(
 
 IFS=$OLDIFS
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel valid filter tests." $NUM_KERNEL_TESTS ||
+check_skip_kernel_test "$NUM_KERNEL_TESTS" "Skipping kernel valid filter tests." ||
 {
 	diag "Test kernel valid filters"