Remove feature.regex-pcre from tests

diff --git a/src/tests/keywords/if-failed-xlat b/src/tests/keywords/if-failed-xlat
index 495d8bed59ecf34182f6e4fada3a80fec331c670..c5a8e840f5eb638223884a99a9cb9473963c2f52 100644 (file)
--- 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 80e90fabedbdd612a88bce40e192ecf87e7d9424..25eac2f41c3a4788c055c712055f8d1c46f86149 100644 (file)
--- 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 be8a8da1d6b852fc64290de24b6cc725dcaddb3d..34c144e8bc094e2510351ec3e6cc28cba29ae97d 100644 (file)
--- 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