From: Nick Porter Date: Mon, 28 Jul 2025 16:14:39 +0000 (+0100) Subject: Remove feature.regex-pcre from tests X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e93df4c8a60d821b44e8acc76721c2656597e150;p=thirdparty%2Ffreeradius-server.git Remove feature.regex-pcre from tests --- diff --git a/src/tests/keywords/if-failed-xlat b/src/tests/keywords/if-failed-xlat index 495d8bed59..c5a8e840f5 100644 --- a/src/tests/keywords/if-failed-xlat +++ b/src/tests/keywords/if-failed-xlat @@ -2,7 +2,7 @@ # PRE: if # -if (('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) { +if ('${feature.regex-pcre2}' == 'yes') { # Check failure when no previous capture - named group # but a failed regex is equivalent to an empty string diff --git a/src/tests/keywords/if-regex-match-comp b/src/tests/keywords/if-regex-match-comp index 80e90fabed..25eac2f41c 100644 --- a/src/tests/keywords/if-regex-match-comp +++ b/src/tests/keywords/if-regex-match-comp @@ -81,7 +81,7 @@ if (test_string =~ /^foo$/) { # compiled - ref - non-multiline # Not all POSIX implementations support the \n character classes # so only run this test if the server was built with libpcre. -if ((('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) && !(test_string =~ /^foo\nbar$/)) { +if (('${feature.regex-pcre2}' == 'yes') && !(test_string =~ /^foo\nbar$/)) { test_fail } diff --git a/src/tests/keywords/if-regex-match-named b/src/tests/keywords/if-regex-match-named index be8a8da1d6..34c144e8bc 100644 --- a/src/tests/keywords/if-regex-match-named +++ b/src/tests/keywords/if-regex-match-named @@ -3,7 +3,7 @@ string result_string string dummy_string -if (('${feature.regex-pcre}' == 'yes') || ('${feature.regex-pcre2}' == 'yes')) { +if ('${feature.regex-pcre2}' == 'yes') { request += { NAS-Port = '123456789' Port-Limit = 1