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=ebf4c3bb1df7c1e1c96cc9bc2a0afe5b89f394de;hb=bff988fac4f8d1ffab3f85f0eec9546c76e57706;hpb=e0bd0ea37926566b1518e894f624d78e9526337f

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index ebf4c3bb1..2c45ee09e 100755
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -25,8 +25,8 @@ EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
 TRACE_PATH=$(mktemp -d)
 NUM_GLOBAL_TESTS=2
-NUM_UST_TESTS=123
-NUM_KERNEL_TESTS=123
+NUM_UST_TESTS=144
+NUM_KERNEL_TESTS=144
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -103,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)"
@@ -120,9 +117,7 @@ INVALID_FILTERS=(
 		'0 || ("abc" != "def")) && (3 < 4)'
 		"a->"
 		"a-->a"
-		"a->a"
 		"a.b.c->d.e.f+1"
-		"asdfasdf->asdfasdf < 2"
 		# String can\'t be root node
 		"\"somestring\""
 		# Unary op on string not allowed
@@ -135,16 +130,29 @@ 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"
-		# A wildcard should only appear as the last character in a string literal
-		"msg == \"my_event*_blah\""
+		# 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"