X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_invalid_filter;h=c639ff172672b52154e8586586a7506a72340425;hp=700fa236940117fda9d85b78a272fef1a52cbb33;hb=bf6ae429bc7bf2fefdce61e48806768dab7567d5;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 700fa2369..c639ff172 100755
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -24,12 +24,10 @@ SESSION_NAME="filter-invalid"
 EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
 TRACE_PATH=$(mktemp -d)
-NUM_TESTS=119
+NUM_TESTS=146
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 function enable_ust_lttng_event_filter
 {
 	sess_name="$1"
@@ -56,7 +54,7 @@ function test_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"
@@ -74,7 +72,7 @@ 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"
@@ -85,6 +83,8 @@ function test_bytecode_limit
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 IFS=$'\n'
 INVALID_FILTERS=(
 		# Unsupported ops
@@ -118,7 +118,7 @@ INVALID_FILTERS=(
 		"!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\""
@@ -133,6 +133,18 @@ INVALID_FILTERS=(
 		# Nesting of binary operator not allowed
 		"1 | (1 | (1 | 1))"
 		"1 > (1 > (1 > 1))"
+		# Exactly one chaining level under \$ctx allowed
+		"\$ctx.vtid.blah == 0"
+		"0 == \$ctx.vtid.blah"
+		"\$ctx.44 == 0"
+		"0 == \$ctx.44"
+		"\$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\""
 		)
 
 start_lttng_sessiond