From 59a718bfa2ebc97641b61a0cf2a4f025155b0dfd Mon Sep 17 00:00:00 2001
From: "Alan T. DeKok" <aland@freeradius.org>
Date: Wed, 9 Feb 2022 15:07:20 -0500
Subject: [PATCH] use "match" to mirror src/tests/unit

---
 src/bin/unit_test_module.c  |  8 ++++----
 src/tests/xlat/expr.txt     |  5 +++++
 src/tests/xlat/rlm_expr.txt | 16 ++++++++--------
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 src/tests/xlat/expr.txt

diff --git a/src/bin/unit_test_module.c b/src/bin/unit_test_module.c
index 378e594dada..9a94105f6f8 100644
--- 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
index 00000000000..60995b755ca
--- /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 1bd86a4c37e..8e4998e5499 100644
--- 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
-- 
2.47.3