You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2026/06/01 17:34:35 UTC
(httpd-tests) branch trunk updated: allow some matches to tolerate different output (#17)
This is an automated email from the ASF dual-hosted git repository.
covener pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/httpd-tests.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7ce6745b allow some matches to tolerate different output (#17)
7ce6745b is described below
commit 7ce6745bfcb951f768108d959ab2f9119c60642f
Author: Eric Covener <co...@apache.org>
AuthorDate: Mon Jun 1 13:34:29 2026 -0400
allow some matches to tolerate different output (#17)
don't require the document name in the output
Co-authored-by: Eric Covener <ec...@us.ibm.com>
---
t/modules/include.t | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/t/modules/include.t b/t/modules/include.t
index 99644971..c11f89f5 100644
--- a/t/modules/include.t
+++ b/t/modules/include.t
@@ -85,7 +85,7 @@ my %test = (
"echo3.shtml" => ['<!--#echo var="DOCUMENT_NAME" -->', "retagged1"],
"notreal.shtml" => "pass <!--",
"malformed.shtml" => "[an error occurred while processing this ".
- "directive] malformed.shtml",
+ "directive]",
"exec/off/cmd.shtml" => "[an error occurred while processing this ".
"directive]",
"exec/on/cmd.shtml" => "pass",
@@ -107,9 +107,9 @@ my %test = (
my %ap_expr_test = (
"apexpr/if1.shtml" => "pass",
"apexpr/err.shtml" => "[an error occurred while processing this ".
- "directive] err.shtml",
+ "directive]",
"apexpr/restrict.shtml" => "[an error occurred while processing this ".
- "directive] restrict.shtml",
+ "directive]",
"apexpr/var.shtml" => "pass pass pass",
"apexpr/lazyvar.shtml" => "pass",
);
@@ -303,6 +303,12 @@ foreach $doc (sort keys %tests) {
skip "Skipping 'exec cgi' test; no cgi module.", 2;
}
}
+ elsif ($doc =~ m/malformed|apexpr/) {
+ ok t_cmp(super_chomp(GET_BODY "$dir$doc"),
+ qr/\Q$tests{$doc}\E/,
+ "GET $dir$doc"
+ );
+ }
else {
ok t_cmp(super_chomp(GET_BODY "$dir$doc"),
$tests{$doc},