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

More regression updates.

Browse Source
This commit is contained in:
brectanus
2008-05-23 19:25:03 +00:00
parent 59629a6aff
commit 49e63a3e30
10 changed files with 568 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,6 +186,13 @@ sub runfile {
$httpd_up = httpd_start() ? 0 : 1;
}
# Run any prerun setup
if ($rc == 0 and exists $t{prerun} and defined $t{prerun}) {
dbg("Executing perl prerun...");
$rc = &{$t{prerun}};
dbg("Perl prerun returned: $rc");
}
if ($httpd_up) {
# Perform the request and check response
if (exists $t{request}) {
@@ -216,6 +223,17 @@ sub runfile {
}
}
}
else {
msg("Failed to start httpd.");
$rc = 1;
}
# Run any arbitrary perl tests
if ($rc == 0 and exists $t{test} and defined $t{test}) {
dbg("Executing perl test(s)...");
$rc = &{$t{test}};
dbg("Perl tests returned: $rc");
}
# Search for all log matches
if ($rc == 0 and exists $t{match_log} and defined $t{match_log}) {
@@ -411,11 +429,6 @@ sub httpd_start {
close $httpd_out;
waitpid($httpd_pid, 0);
if (defined $out and $out ne "") {
msg("Httpd start failed with error messages:\n$out");
return -1
}
my $rc = $?;
if ( WIFEXITED($rc) ) {
$rc = WEXITSTATUS($rc);
@@ -430,6 +443,11 @@ sub httpd_start {
$rc = -1;
}
if (defined $out and $out ne "") {
msg("Httpd start failed with error messages:\n$out");
return -1
}
# Look for startup msg
unless (defined match_log("error", qr/resuming normal operations/, 10)) {
quit(1, "Httpd server failed to start.");