svn commit: r1652905 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/directorymatch.t

[co...@apache.org]

Author: covener
Date: Mon Jan 19 04:42:07 2015
New Revision: 1652905

URL: http://svn.apache.org/r1652905
Log:
check in a basic safety net test for DirectoryMatch. Currently broke on trunk only.



Added:
    httpd/test/framework/trunk/t/modules/directorymatch.t
Modified:
    httpd/test/framework/trunk/t/conf/extra.conf.in

Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1652905&r1=1652904&r2=1652905&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Mon Jan 19 04:42:07 2015
@@ -379,6 +379,11 @@ Alias /manual @inherit_documentroot@/man
             Header add mod_headers_foo bar
         </Location>
     </VirtualHost>
+
+    # Should match anything mapped to disk
+    <DirectoryMatch ^>
+      Header append DMMATCH1 1
+    </DirectoryMatch>
 </IfModule>
 
 ##

Added: httpd/test/framework/trunk/t/modules/directorymatch.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/directorymatch.t?rev=1652905&view=auto
==============================================================================
--- httpd/test/framework/trunk/t/modules/directorymatch.t (added)
+++ httpd/test/framework/trunk/t/modules/directorymatch.t Mon Jan 19 04:42:07 2015
@@ -0,0 +1,26 @@
+use strict;
+use warnings FATAL => 'all';
+
+use Apache::Test;
+use Apache::TestRequest;
+use Apache::TestUtil;
+use Apache::TestConfig ();
+
+## 
+## directorymatch tests
+##
+
+my @ts = (
+    { url => "/index.html", code => 200, hname => "DMMATCH1"},
+    # TODO: PR41867 (DirectoryMatch matches files)
+);
+
+plan tests => 2* scalar @ts, have_module 'headers';
+
+for my $t (@ts) {
+  my $r = GET $t->{'url'};
+  ok t_cmp($r->code, $t->{code}, "code for " . $t->{'url'});
+  ok t_cmp($r->header($t->{'hname'}), "1", "check for " . $t->{'hname'});
+}
+
+