jwoolley 2003/07/21 13:50:35
Modified: perl-framework/t/modules include.t
Added: perl-framework/t/htdocs/modules/include/bucketeer y7.shtml
Log:
add a more stringent mod_include test. ron says this fails for him even
with the proposed mod_include patch, though it passes for me. odd.
submitted by: ron park
Revision Changes Path
1.1
httpd-test/perl-framework/t/htdocs/modules/include/bucketeer/y7.shtml
Index: y7.shtml
===================================================================
Before If <!-- comment --><!--#if expr="$FALSE" -->AnythingNothing<!--#else
-->SomethingElse<!--#endif --><!-- right after if -->After if
1.26 +11 -3 httpd-test/perl-framework/t/modules/include.t
Index: include.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/modules/include.t,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -u -r1.25 -r1.26
--- include.t 11 Jul 2003 23:05:44 -0000 1.25
+++ include.t 21 Jul 2003 20:50:35 -0000 1.26
@@ -70,11 +70,11 @@
#
# in addition to $tests, there are 1 GET test, 9 XBitHack tests,
-# 2 exec cgi tests, 2 malformed-ssi-directive tests, and 8 tests
+# 2 exec cgi tests, 2 malformed-ssi-directive tests, and 9 tests
# that use mod_bucketeer to construct brigades for mod_include
#
my $tests = keys %test;
-plan tests => $tests + 22, have_module 'include';
+plan tests => $tests + 23, have_module 'include';
foreach $doc (sort keys %test) {
ok t_cmp($test{$doc},
@@ -91,7 +91,7 @@
### MALFORMED DIRECTIVE TESTS
-# also test a couple of malformed SSI's that used to cause Apache 1.3 to
+# also test a couple of malformed SSIs that used to cause Apache 1.3 to
# segfault
#
@@ -257,6 +257,14 @@
$expected= "BeforeIfElseBlockAfterIf";
$doc = "bucketeer/y6.shtml";
+ ok t_cmp($expected,
+ super_chomp(GET_BODY "$dir$doc"),
+ "GET $dir$doc"
+ );
+
+ $expected= "Before If <!-- comment -->SomethingElse".
+ "<!-- right after if -->After if";
+ $doc = "bucketeer/y7.shtml";
ok t_cmp($expected,
super_chomp(GET_BODY "$dir$doc"),
"GET $dir$doc"
