From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 29 Sep 2023 14:26:06 +0000 (-0400)
Subject: wrap tests in group { ... } so the tests can declare local variables
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6b2e823eeb58a75222bff5bd5d1e68cb8e37647;p=thirdparty%2Ffreeradius-server.git

wrap tests in group { ... } so the tests can declare local variables
---

diff --git a/src/tests/keywords/dhcpv4.conf b/src/tests/keywords/dhcpv4.conf
index bd7e67edfcb..841f4ae1e25 100644
--- a/src/tests/keywords/dhcpv4.conf
+++ b/src/tests/keywords/dhcpv4.conf
@@ -44,9 +44,15 @@ server default {
 
 	recv Discover {
 		#
-		# Include the test file specified by the
-		# KEYWORD environment variable.
+		#  Include the test file specified by the
+		#  KEYWORD environment variable.
 		#
-		$INCLUDE ${keyword}/$ENV{KEYWORD}
+		#  Wrap it in a "group" so that the test
+		#  can put local variable definitions at the
+		#  top of the file.
+		#
+		group {
+			$INCLUDE ${keyword}/$ENV{KEYWORD}
+		}
 	}
 }
diff --git a/src/tests/keywords/dhcpv6.conf b/src/tests/keywords/dhcpv6.conf
index 7176367a8af..981bbc20fbc 100644
--- a/src/tests/keywords/dhcpv6.conf
+++ b/src/tests/keywords/dhcpv6.conf
@@ -44,9 +44,15 @@ server default {
 
 	recv Solicit {
 		#
-		# Include the test file specified by the
-		# KEYWORD environment variable.
+		#  Include the test file specified by the
+		#  KEYWORD environment variable.
 		#
-		$INCLUDE ${keyword}/$ENV{KEYWORD}
+		#  Wrap it in a "group" so that the test
+		#  can put local variable definitions at the
+		#  top of the file.
+		#
+		group {
+			$INCLUDE ${keyword}/$ENV{KEYWORD}
+		}
 	}
 }
diff --git a/src/tests/keywords/radius.conf b/src/tests/keywords/radius.conf
index fc9113326ef..245a969665a 100644
--- a/src/tests/keywords/radius.conf
+++ b/src/tests/keywords/radius.conf
@@ -131,10 +131,16 @@ server default {
 		&control.Password.Cleartext := "hello"
 
 		#
-		# Include the test file specified by the
-		# KEYWORD environment variable.
+		#  Include the test file specified by the
+		#  KEYWORD environment variable.
 		#
-		$INCLUDE ${keyword}/$ENV{KEYWORD}
+		#  Wrap it in a "group" so that the test
+		#  can put local variable definitions at the
+		#  top of the file.
+		#
+		group {
+			$INCLUDE ${keyword}/$ENV{KEYWORD}
+		}
 
 		if (&control.Password.Cleartext) {
 			pap