Fix: filter tests now accept "." in identifiers

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter
index bfc817d3f1133655a53af10f33413cbfba6d19d8..9df5f2cbfc439bfd542633e6b11126537e146dcc 100755 (executable)
--- 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=144
-NUM_KERNEL_TESTS=144
+NUM_UST_TESTS=123
+NUM_KERNEL_TESTS=123
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -117,14 +117,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
                "\"somestring\""
@@ -141,11 +137,6 @@ 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

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 28347a42cc52395dd10329d4c5fb3c807ec20dac..0a3a5a4436a0e5b071981674dc9511cad30130b4 100755 (executable)
--- 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
@@ -408,6 +408,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,6 +471,13 @@ 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
 )
 
 diag "Test UST valid filters"
@@ -537,6 +551,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,6 +610,13 @@ 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
 )
 
 if [ "$(id -u)" == "0" ]; then