use "match" to mirror src/tests/unit

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 378e594dada6e2be800ac7bf8b3b2a59ca479422..9a94105f6f8666b6b8b48b40303a289cbfb8ee33 100644 (file)
--- a/src/bin/unit_test_module.c
+++ b/src/bin/unit_test_module.c
@@ -457,12 +457,12 @@ static bool do_xlats(fr_event_list_t *el, char const *filename, FILE *fp)
                }
 
                /*
-                *      Look for "data".
+                *      Look for "match".
                 */
-               if (strncmp(input, "data ", 5) == 0) {
-                       if (strcmp(input + 5, output) != 0) {
+               if (strncmp(input, "match ", 6) == 0) {
+                       if (strcmp(input + 6, output) != 0) {
                                fprintf(stderr, "Mismatch at line %d of %s\n\tgot      : %s\n\texpected : %s\n",
-                                       lineno, filename, output, input + 5);
+                                       lineno, filename, output, input + 6);
                                TALLOC_FREE(request);
                                return false;
                        }

diff --git a/src/tests/xlat/expr.txt b/src/tests/xlat/expr.txt
new file mode 100644 (file)
index 0000000..60995b7
--- /dev/null
+++ b/src/tests/xlat/expr.txt
@@ -0,0 +1,5 @@
+xlat_expr 1 && 2
+match yes
+
+#xlat_expr 1 < 2
+#match yes

diff --git a/src/tests/xlat/rlm_expr.txt b/src/tests/xlat/rlm_expr.txt
index 1bd86a4c37e69d0e7db46f95074a92c174b7cf68..8e4998e54998167db1da62b029bccb025a2254b5 100644 (file)
--- a/src/tests/xlat/rlm_expr.txt
+++ b/src/tests/xlat/rlm_expr.txt
@@ -1,23 +1,23 @@
 xlat %{expr: 1 + 2 + 3 + 4}
-data 10
+match 10
 
 xlat %{expr: 1 & ~1}
-data 0
+match 0
 
 xlat %{expr: 2 - -1}
-data 3
+match 3
 
 xlat %{expr: -1 * 2}
-data -2
+match -2
 
 xlat %{expr: 1 << 2 | 1}
-data 5
+match 5
 
 xlat %{expr: 6 + -(1 + 3)}
-data 2
+match 2
 
 xlat %{tolower:\%{ FOO}
-data %{ foo
+match %{ foo
 
 xlat \%D
-data %D
+match %D