Skip to content

Commit 97ebce6

Browse files
author
Felipe Zimmerle
committed
tests: Adds apache-v3 as a new platform
run-regression-tests script was changed accordingly.
1 parent 530fdc9 commit 97ebce6

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

tests/regression/config/00-load-modsec.t

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
comment => "module loaded",
44
match_log => {
55
error => {
6+
apache_v3 => [ qr/ModSecurity-Apache/, 10 ],
67
apache => [ qr/ModSecurity for Apache.* configured\./, 10 ],
78
nginx => [ qr/ModSecurity for nginx.* configured\./, 10 ],
89
},
@@ -22,6 +23,7 @@
2223
},
2324
match_log => {
2425
error => {
26+
apache_v3 => [ qr/ModSecurity-Apache/, 10 ],
2527
apache => [ qr/ModSecurity for Apache.* configured\./, 10 ],
2628
nginx => [ qr/ModSecurity for nginx.* configured\./, 10 ],
2729
},

tests/run-regression-tests.pl.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ if ($HTTPD eq "\@APXS_HTTPD\@") {
5151

5252
$SIG{TERM} = $SIG{INT} = \&handle_interrupt;
5353

54-
my $platform = "apache";
54+
my $platform = "apache_v3";
55+
my $platform_alternative = "apache";
5556

5657
my %opt;
5758
getopts('A:E:D:C:T:H:a:p:dvh', \%opt);
@@ -236,6 +237,9 @@ sub runfile {
236237
if ($m->{$platform}) {
237238
$m = $m->{$platform};
238239
}
240+
elsif ($m->{$platform_alternative}) {
241+
$m = $m->{$platform_alternative};
242+
}
239243
else {
240244
my $ap = join(", ", keys %{$m});
241245
msg("Warning: trying to match: $mtype. Nothing " .

0 commit comments

Comments
 (0)