pytest_suite: fix hardcoded absolute paths in .htaccess files

Both files were committed with /Users/jjagielski/... paths that only
work on one developer's machine.

autoindex2/dir_protected/.htaccess: AuthUserFile now uses a path
relative to ServerRoot (Apache 2.4+ resolves these against the
configured ServerRoot, which the test framework sets to pytest_suite/t/).

setenvif/htaccess/.htaccess: file() argument in SetEnvIfExpr now uses
%{DOCUMENT_ROOT} instead of a hardcoded absolute path.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934937 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess
index 37bd439c51f483fb3bab0ada6b2b3301da999d7d..7c14448d2cb38c7c89b96418c5951b634af07a26 100644 (file)
--- a/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess
+++ b/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/.htaccess
@@ -1,4 +1,4 @@
 AuthType Basic
 AuthName "Restricted Directory"
-AuthUserFile /Users/jjagielski/src/asf/httpd/test/pytest_suite/t/htdocs/modules/autoindex2/dir_protected/htpasswd
+AuthUserFile htdocs/modules/autoindex2/dir_protected/htpasswd
 Require valid user

diff --git a/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess b/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess
index a2c2bf38bb658dd16c65ac62880f8705d1da7eef..8eabdc3c76a860744fbcb7b47c344e1f17277668 100644 (file)
--- a/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess
+++ b/test/pytest_suite/t/htdocs/modules/setenvif/htaccess/.htaccess
@@ -1 +1 @@
-SetEnvIfExpr "file('/Users/jjagielski/src/asf/httpd/test/pytest_suite/t/htdocs/foobar.html') =~ /(.+)/" VAR_ONE=$0
\ No newline at end of file
+SetEnvIfExpr "file('%{DOCUMENT_ROOT}/foobar.html') =~ /(.+)/" VAR_ONE=$0
\ No newline at end of file