.gitignore: ignore local vscode workspace settings file

[lttng-tools.git] / tests / regression / tools / filtering / test_invalid_filter

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 7d9e524d986fad0a94426cf1eef6d46c0b706fed..2dd57b0bbbbcceb1339929b2fc44e63a5fa3120b 100755 (executable)
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -24,7 +24,7 @@ TESTDIR=$CURDIR/../../..
 SESSION_NAME="filter-invalid"
 EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
-TRACE_PATH=$(mktemp --tmpdir -d tmp.test_filtering_invalid_filters_trace_path.XXXXXX)
+TRACE_PATH=$(mktemp -d -t tmp.test_filtering_invalid_filters_trace_path.XXXXXX)
 NUM_GLOBAL_TESTS=2
 NUM_UST_TESTS=138
 NUM_KERNEL_TESTS=138
@@ -94,6 +94,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 OLDIFS="$IFS"
 IFS=$'\n'
 INVALID_FILTERS=(
@@ -168,13 +170,7 @@ done
 
 test_bytecode_limit -u
 
-if [ "$(id -u)" == "0" ]; then
-       isroot=1
-else
-       isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel invalid filter tests." $NUM_KERNEL_TESTS ||
+check_skip_kernel_test "$NUM_KERNEL_TESTS" "Skipping kernel invalid filter tests." ||
 {
        diag "Test kernel filters"
        i=0