X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=fe854a70ceb0078c5ec271aa01d4a0003e885c29;hb=80744d94f88ffa368f0ee5bfc51dcf8c217028ad;hp=28347a42cc52395dd10329d4c5fb3c807ec20dac;hpb=f6788fc449c6001c57476ee37c3387d299e08109;p=lttng-tools.git

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 28347a42c..fe854a70c 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -24,8 +24,8 @@ STATS_BIN="$TESTDIR/utils/babelstats.pl"
 SESSION_NAME="valid_filter"
 NR_ITER=100
 NUM_GLOBAL_TESTS=2
-NUM_UST_TESTS=288
-NUM_KERNEL_TESTS=288
+NUM_UST_TESTS=330
+NUM_KERNEL_TESTS=330
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -72,7 +72,7 @@ function test_valid_filter
 	create_lttng_session_ok $SESSION_NAME $trace_path
 
 	# Enable filter
-	enable_lttng_event_filter $domain $SESSION_NAME $event_name $filter
+	enable_lttng_event_filter $domain $SESSION_NAME "$event_name" "$filter"
 
 	# Trace apps
 	start_lttng_tracing_ok $SESSION_NAME
@@ -344,8 +344,6 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-IFS=$'\n'
-
 issue_356_filter="intfield > 0 && intfield > 1 && "
 issue_356_filter+="intfield > 2 && intfield > 3 && "
 issue_356_filter+="intfield > 4 && intfield > 5 && "
@@ -360,6 +358,9 @@ BIN_NAME="gen-ust-events"
 
 # One to one mapping between filters and validators
 
+# Set IFS to newline to facilitate array declaration
+OLDIFS="$IFS"
+IFS=$'\n'
 UST_FILTERS=("intfield"                                                 #1
 	 "intfield > 1"                                                 #2
 	 "intfield >= 1"                                                #3
@@ -408,6 +409,13 @@ UST_FILTERS=("intfield"                                                 #1
 	 "\$ctx.procname == \"*\""                                      #46
 	 "\"*\" != \$ctx.procname"                                      #47
 	 "\"*\" == \$ctx.procname"                                      #48
+	 "!a.f.d"							#49
+	 "a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a"			#50
+	 "\$ctx.vtid.blah == 0"						#51
+	 "asdf.asdfsd.sadf < 4"						#52
+	 "0 == \$ctx.vtid.blah"						#53
+	 "\$ctx.44 == 0"						#54
+	 "0 == \$ctx.44"						#55
 )
 
 UST_FILTER_COUNT=${#UST_FILTERS[@]}
@@ -464,8 +472,17 @@ UST_VALIDATOR=("validator_intfield"                 #1
 	   "validator_has_events"                   #46
 	   "validator_has_no_event"                 #47
 	   "validator_has_events"                   #48
+	   "validator_has_no_event"                 #49
+	   "validator_has_no_event"                 #50
+	   "validator_has_no_event"                 #51
+	   "validator_has_no_event"                 #52
+	   "validator_has_no_event"                 #53
+	   "validator_has_no_event"                 #54
+	   "validator_has_no_event"                 #55
 )
 
+IFS="$OLDIFS"
+
 diag "Test UST valid filters"
 
 KERNEL_CHECK=0
@@ -488,7 +505,9 @@ done
 BIN_NAME="test_valid_filt"	# Current script name truncated by kernel
 
 # One to one mapping between filters and validators
-
+# Set IFS to newline to facilitate array declaration
+OLDIFS="$IFS"
+IFS=$'\n'
 KERNEL_FILTERS=("intfield"                                              #1
 	 "intfield > 1"                                                 #2
 	 "intfield >= 1"                                                #3
@@ -537,6 +556,13 @@ KERNEL_FILTERS=("intfield"                                              #1
 	 "\$ctx.procname == \"*\""                                      #46
 	 "\"*\" != \$ctx.procname"                                      #47
 	 "\"*\" == \$ctx.procname"                                      #48
+	 "!a.f.d"							#49
+	 "a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a.a"			#50
+	 "\$ctx.vtid.blah == 0"						#51
+	 "asdf.asdfsd.sadf < 4"						#52
+	 "0 == \$ctx.vtid.blah"						#53
+	 "\$ctx.44 == 0"						#54
+	 "0 == \$ctx.44"						#55
 )
 
 KERNEL_FILTER_COUNT=${#KERNEL_FILTERS[@]}
@@ -589,8 +615,17 @@ KERNEL_VALIDATOR=("validator_intfield"              #1
 	   "validator_has_events"                   #46
 	   "validator_has_no_event"                 #47
 	   "validator_has_events"                   #48
+	   "validator_has_no_event"                 #49
+	   "validator_has_no_event"                 #50
+	   "validator_has_no_event"                 #51
+	   "validator_has_no_event"                 #52
+	   "validator_has_no_event"                 #53
+	   "validator_has_no_event"                 #54
+	   "validator_has_no_event"                 #55
 )
 
+IFS=$OLDIFS
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else