X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_invalid_filter;h=2c45ee09e75170b0738bec630cb8d6a8d409f893;hp=9e8a3c6f61fc917bb8cec6226bb064ceaf4760e5;hb=bff988fac4f8d1ffab3f85f0eec9546c76e57706;hpb=e3bef7256ce348cf232ede3f36721e661cfda2a7

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 9e8a3c6f6..2c45ee09e 100755
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -24,17 +24,22 @@ SESSION_NAME="filter-invalid"
 EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
 TRACE_PATH=$(mktemp -d)
-NUM_TESTS=119
+NUM_GLOBAL_TESTS=2
+NUM_UST_TESTS=144
+NUM_KERNEL_TESTS=144
+NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
 
-function enable_ust_lttng_event_filter
+function enable_lttng_event_filter
 {
-	sess_name="$1"
-	event_name="$2"
-	filter="$3"
+	domain="$1"
+	sess_name="$2"
+	event_name="$3"
+	filter="$4"
 
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name \
+		$domain --filter "$filter" 2> $ENABLE_EVENT_STDERR 1> /dev/null
 
 	# Enable must fail
 	if [ $? -eq 0 ]; then
@@ -48,23 +53,26 @@ function enable_ust_lttng_event_filter
 
 function test_invalid_filter
 {
-	test_invalid_filter="$1"
+	domain="$1"
+	test_invalid_filter="$2"
 
 	diag "Test filter expression with invalid filter"
 	diag "Filter: $test_invalid_filter"
 
 	# Create session
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# Apply filter
-	enable_ust_lttng_event_filter $SESSION_NAME $EVENT_NAME "$test_invalid_filter"
+	enable_lttng_event_filter $domain $SESSION_NAME $EVENT_NAME "$test_invalid_filter"
 
 	# Destroy session
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 function test_bytecode_limit
 {
+	domain="$1"
+
 	# Current bytecode limitation is 65536 bytes long.
 	# Generate a huge bytecode with some perl-fu
 	BYTECODE_LIMIT=`perl -e 'print "intfield" . " && 1" x5460'`
@@ -72,19 +80,20 @@ function test_bytecode_limit
 	diag "Test filter bytecode limits (64KiB)"
 
 	# Create session
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
 	# Apply filter
-	enable_ust_lttng_event_filter $SESSION_NAME $EVENT_NAME "$BYTECODE_LIMIT"
+	enable_lttng_event_filter $domain $SESSION_NAME $EVENT_NAME "$BYTECODE_LIMIT"
 
 	# Destroy session
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+OLDIFS="$IFS"
 IFS=$'\n'
 INVALID_FILTERS=(
 		# Unsupported ops
@@ -94,9 +103,6 @@ INVALID_FILTERS=(
 		"intfield-1"
 		"intfield>>1"
 		"intfield<<1"
-		"intfield&1"
-		"intfield|1"
-		"intfield^1"
 		"~intfield"
 		"1+11111-3333+1"
 		"(1+2)*(55*666)"
@@ -109,16 +115,10 @@ INVALID_FILTERS=(
 		# Unmatched parenthesis
 		"((((((((((((((intfield)))))))))))))"
 		'0 || ("abc" != "def")) && (3 < 4)'
-		# Field dereference
-		"a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a"
 		"a->"
 		"a-->a"
-		"a->a"
 		"a.b.c->d.e.f+1"
-		"!a.f.d"
-		"asdf.asdfsd.sadf < 4"
-		"asdfasdf->asdfasdf < 2"
-		# String can't be root node
+		# String can\'t be root node
 		"\"somestring\""
 		# Unary op on string not allowed
 		"!\"somestring\""
@@ -130,20 +130,62 @@ INVALID_FILTERS=(
 		# Logical operator with string type not allowed
 		"\"somestring\" || 1"
 		"1 || \"somestring\""
-		# Nesting of binary operator not allowed
-		"1 | (1 | (1 | 1))"
-		"1 > (1 > (1 > 1))"
-		)
+		"\$ctx == 0"
+		"0 == \$ctx"
+		# Only \$ctx is supported for now
+		"\$global.value == 0"
+		"0 == \$global.value"
+		# Cannot compare two full star globbing patterns
+		'"hello*world" == "yes*man"'
+		'"hello*world" == "yesman*"'
+		'"helloworld*" == "yes*man"'
+		# May only use != and == operators when one of them is a full
+		# star globbing pattern
+		'"hello*world" < field'
+		'"hello*world" <= field'
+		'"hello*world" >= field'
+		'"hello*world" > field'
+		'"hello*world" || field'
+		'"hello*world" && field'
+		'field < "hello*world"'
+		'field <= "hello*world"'
+		'field >= "hello*world"'
+		'field > "hello*world"'
+		'field && "hello*world"'
+		'field || "hello*world"'
+)
+IFS="$OLDIFS"
 
 start_lttng_sessiond
-for FILTER in ${INVALID_FILTERS[@]};
-do
-	test_invalid_filter "$FILTER"
+diag "Test UST filters"
+
+i=0
+while [ "$i" -lt "${#INVALID_FILTERS[@]}" ]; do
+	echo "${INVALID_FILTERS[$i]}"
+	test_invalid_filter -u "${INVALID_FILTERS[$i]}"
+	let "i++"
 done
 
-test_bytecode_limit
+test_bytecode_limit -u
+
+if [ "$(id -u)" == "0" ]; then
+	isroot=1
+else
+	isroot=0
+fi
 
-unset IFS
+skip $isroot "Root access is needed. Skipping all kernel invalid filter tests." $NUM_KERNEL_TESTS ||
+{
+	diag "Test kernel filters"
+	i=0
+	while [ "$i" -lt "${#INVALID_FILTERS[@]}" ]; do
+		echo "${INVALID_FILTERS[$i]}"
+		test_invalid_filter -k "${INVALID_FILTERS[$i]}"
+		let "i++"
+	done
+
+	test_bytecode_limit -k
+}
 stop_lttng_sessiond
 
 rm -f $ENABLE_EVENT_STDERR