From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 27 Mar 2013 19:28:01 +0000 (-0400)
Subject: tests: implement context filtering tests
X-Git-Tag: v2.2.0-rc1~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6d5d85c79765744fcad6ba189a256784b825e7bf;p=lttng-tools.git

tests: implement context filtering tests

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index 9e8a3c6f6..5e096a5b3 100755
--- a/tests/regression/tools/filtering/test_invalid_filter
+++ b/tests/regression/tools/filtering/test_invalid_filter
@@ -24,7 +24,7 @@ SESSION_NAME="filter-invalid"
 EVENT_NAME="bogus"
 ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr"
 TRACE_PATH=$(mktemp -d)
-NUM_TESTS=119
+NUM_TESTS=143
 
 source $TESTDIR/utils/utils.sh
 
@@ -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,16 @@ 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"
 		)
 
 start_lttng_sessiond
diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 5587fdec2..7170eb57c 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -25,7 +25,7 @@ STATS_BIN="babelstats.pl"
 SESSION_NAME="valid_filter"
 EVENT_NAME="tp:tptest"
 NR_ITER=100
-NUM_TESTS=198
+NUM_TESTS=338
 
 source $TESTDIR/utils/utils.sh
 
@@ -144,6 +144,32 @@ function validator_intfield_gt
 	return $status
 }
 
+function validator_has_no_event
+{
+	stats="$1"
+	status=0
+
+	validate_min_max "$stats" "intfield" "0" "99"
+	status=$(($status|$?))
+
+	if [ $status -eq 0 ]; then
+		return 1
+	else
+		return 0
+	fi
+}
+
+function validator_has_events
+{
+	stats="$1"
+	status=0
+
+	validate_min_max "$stats" "intfield" "0" "99"
+	status=$(($status|$?))
+
+	return $status
+}
+
 function validator_intfield_ge
 {
 	stats="$1"
@@ -351,6 +377,26 @@ FILTERS=("intfield"                                                     #1
 	 "stringfield2 == \"\\\*\""                                     #26
 	 "1.0 || intfield || 1.0"                                       #27
 	 "1 < intfield"                                                 #28
+	 "\$ctx.vtid == 0"                                              #29
+	 "\$ctx.vtid != 0"                                              #30
+	 "0 == \$ctx.vtid"                                              #31
+	 "0 != \$ctx.vtid"                                              #32
+	 "\$ctx.vpid == 0"                                              #33
+	 "\$ctx.vpid != 0"                                              #34
+	 "0 == \$ctx.vpid"                                              #35
+	 "0 != \$ctx.vpid"                                              #36
+	 "\$ctx.procname != \"$BIN_NAME\""                              #37
+	 "\$ctx.procname == \"$BIN_NAME\""                              #38
+	 "\"$BIN_NAME\" != \$ctx.procname"                              #39
+	 "\"$BIN_NAME\" == \$ctx.procname"                              #40
+	 "\$ctx.procname != \"$BIN_NAME*\""                             #41
+	 "\$ctx.procname == \"$BIN_NAME*\""                             #42
+	 "\"$BIN_NAME*\" != \$ctx.procname"                             #43
+	 "\"$BIN_NAME*\" == \$ctx.procname"                             #44
+	 "\$ctx.procname != \"*\""                                      #45
+	 "\$ctx.procname == \"*\""                                      #46
+	 "\"*\" != \$ctx.procname"                                      #47
+	 "\"*\" == \$ctx.procname"                                      #48
 )
 
 VALIDATOR=("validator_intfield"                     #1
@@ -381,6 +427,26 @@ VALIDATOR=("validator_intfield"                     #1
 	   "validator_true_statement"               #26
 	   "validator_true_statement"               #27
 	   "validator_intfield_gt"                  #28
+	   "validator_has_no_event"                 #29
+	   "validator_has_events"                   #30
+	   "validator_has_no_event"                 #31
+	   "validator_has_events"                   #32
+	   "validator_has_no_event"                 #33
+	   "validator_has_events"                   #34
+	   "validator_has_no_event"                 #35
+	   "validator_has_events"                   #36
+	   "validator_has_no_event"                 #36
+	   "validator_has_events"                   #37
+	   "validator_has_no_event"                 #38
+	   "validator_has_events"                   #39
+	   "validator_has_no_event"                 #41
+	   "validator_has_events"                   #42
+	   "validator_has_no_event"                 #43
+	   "validator_has_events"                   #44
+	   "validator_has_no_event"                 #45
+	   "validator_has_events"                   #46
+	   "validator_has_no_event"                 #47
+	   "validator_has_events"                   #48
 )
 
 FILTER_COUNT=${#FILTERS[@]}