github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-29 19:24:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some reorg of regression tests.

Browse Source
This commit is contained in:
brectanus
2008-05-27 19:08:51 +00:00
parent 49e63a3e30
commit 4bc1fc39f0
6 changed files with 45 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apache2/t/run-regression-tests.pl.in
View File

@@ -73,8 +73,8 @@ EOT
usage() if ($opt{h});
### Check startup script
$opt{a} = "httpd" unless (defined $opt{a});
### Check httpd binary
$opt{a} = "@APXS_HTTPD@" unless (defined $opt{a});
usage("Invalid Apache startup script: $opt{a}\n") unless (-e $opt{a});
### Defaults
@@ -85,6 +85,11 @@ $opt{C} = "$CONF_DIR/httpd.conf" unless (defined $opt{C});
$opt{H} = "$SROOT_DIR/htdocs" unless (defined $opt{H});
$opt{p} = 8088 unless (defined $opt{p});
unless (defined $opt{S}) {
my $httpd_root = `$opt{a} -V`;
($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
}
%ENV = (
%ENV,
SERVER_ROOT => $opt{S},
@@ -103,11 +108,6 @@ $opt{p} = 8088 unless (defined $opt{p});
USER_AGENT => $UA_NAME,
);
unless (defined $opt{S}) {
my $httpd_root = `$opt{a} -V`;
($opt{S} = $httpd_root) =~ s/.*-D HTTPD_ROOT="([^"]*)".*/$1/sm;
}
dbg("OPTIONS: ", \%opt);
if (-e "$PID_FILE") {