X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_invalid_filter;h=2dd57b0bbbbcceb1339929b2fc44e63a5fa3120b;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=2c45ee09e75170b0738bec630cb8d6a8d409f893;hpb=bff988fac4f8d1ffab3f85f0eec9546c76e57706;p=lttng-tools.git

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 2c45ee09e..2dd57b0bb 100755
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -1,6 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2012 Christian Babeux <christian.babeux@efficios.com>
+#
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # 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
@@ -19,14 +21,13 @@ TEST_DESC="Filtering - Invalid filters"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-LTTNG_BIN="lttng"
 SESSION_NAME="filter-invalid"
 EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_filtering_invalid_filters_trace_path.XXXXXX)
 NUM_GLOBAL_TESTS=2
-NUM_UST_TESTS=144
-NUM_KERNEL_TESTS=144
+NUM_UST_TESTS=138
+NUM_KERNEL_TESTS=138
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -93,6 +94,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 OLDIFS="$IFS"
 IFS=$'\n'
 INVALID_FILTERS=(
@@ -101,9 +104,6 @@ INVALID_FILTERS=(
 		"intfield/1"
 		"intfield+1"
 		"intfield-1"
-		"intfield>>1"
-		"intfield<<1"
-		"~intfield"
 		"1+11111-3333+1"
 		"(1+2)*(55*666)"
 		"1+2*55*666"
@@ -153,6 +153,8 @@ INVALID_FILTERS=(
 		'field > "hello*world"'
 		'field && "hello*world"'
 		'field || "hello*world"'
+		# Array expression must contain constant index
+		'field[abc] == 1'
 )
 IFS="$OLDIFS"
 
@@ -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