author | Petr Sumbera <petr.sumbera@oracle.com> |
Thu, 14 Mar 2013 13:45:44 -0700 | |
changeset 1212 | 207ff3b0329a |
permissions | -rw-r--r-- |
1212
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Allows to run test suite when it's configured and build outside of |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
source directory. |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
--- modsecurity-apache_2.7.2/tests/run-unit-tests.pl.in Tue Jan 22 18:47:08 2013 |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
+++ modsecurity-apache_2.7.2/tests/run-unit-tests.pl.in Wed Mar 13 08:23:44 2013 |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
@@ -16,7 +16,7 @@ |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
my @TYPES = qw(tfn op action); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
my $TEST = "./msc_test"; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
my $SCRIPT = basename($0); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
-my $SCRIPTDIR = dirname($0); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
+my $SCRIPTDIR = "@srcdir@"; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
my $PASSED = 0; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
my $TOTAL = 0; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
my $DEBUG = $ENV{MSC_TEST_DEBUG} || 0; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
@@ -85,7 +85,10 @@ |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
$param = escape($t{output}); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
} |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
elsif ($t{type} eq "op") { |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
- $param = escape($t{param}); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+ $param = escape($t{param}); |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ if ($t{name} eq "pmFromFile") { |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
+ $param = "$SCRIPTDIR/$param"; |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
+ } |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
} |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
elsif ($t{type} eq "action") { |
207ff3b0329a
16476497 Upgrade ModSecurity to version 2.7.2
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
$param = escape($t{param}); |