| author | Petr Sumbera <petr.sumbera@oracle.com> |
| Tue, 11 Aug 2015 02:10:37 -0700 | |
| changeset 4788 | 159f02dfcdd3 |
| permissions | -rw-r--r-- |
|
4788
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
1 |
Patch origin: in-house |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
2 |
Patch status: will be submitted to upstream |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
3 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
4 |
Add support for system-test which allows to test mod_perl installed on |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
5 |
system. |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
6 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
7 |
--- Apache-Test/lib/Apache/TestMM.pm |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
8 |
+++ Apache-Test/lib/Apache/TestMM.pm |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
9 |
@@ -101,8 +101,15 @@ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
10 |
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
11 |
t/TEST $(APACHE_TEST_EXTRA_ARGS) -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
12 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
13 |
+run_system_tests : |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
14 |
+ $(PASSENV) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
15 |
+ $(FULLPERL) -I$(APACHEINSTALLSITELIB) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
16 |
+ t/TEST $(APACHE_TEST_EXTRA_ARGS) -libmodperl $(APACHEINSTALLSITELIB)/../../libexec/mod_perl.so -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
17 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
18 |
test :: pure_all test_clean run_tests |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
19 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
20 |
+system_test :: pure_all test_clean run_system_tests |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
21 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
22 |
test_config : |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
23 |
$(PASSENV) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
24 |
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
25 |
--- Makefile.PL |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
26 |
+++ Makefile.PL |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
27 |
@@ -850,22 +850,38 @@ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
28 |
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
29 |
t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
30 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
31 |
+run_system_tests : test_clean |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
32 |
+ $(PASSENV) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
33 |
+ $(FULLPERL) -I$(INSTALLSITELIB) \ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
34 |
+ t/TEST -libmodperl $(INSTALLSITELIB)/../../libexec/mod_perl.so -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
35 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
36 |
run_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
37 |
cd ModPerl-Registry && $(MAKE) test |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
38 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
39 |
+run_system_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
40 |
+ cd ModPerl-Registry && $(MAKE) system_test APACHEINSTALLSITELIB=$(INSTALLSITELIB) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
41 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
42 |
run_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
43 |
cd Apache-Reload && $(MAKE) test |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
44 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
45 |
+run_system_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
46 |
+ cd Apache-Reload && $(MAKE) system_test APACHEINSTALLSITELIB=$(INSTALLSITELIB) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
47 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
48 |
EOF |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
49 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
50 |
$preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
51 |
run_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
52 |
cd Apache-SizeLimit && $(MAKE) test |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
53 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
54 |
+run_system_subtests :: |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
55 |
+ cd Apache-SizeLimit && $(MAKE) system_test APACHEINSTALLSITELIB=$(INSTALLSITELIB) |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
56 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
57 |
EOF |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
58 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
59 |
$preamble .= <<'EOF'; |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
60 |
test :: pure_all run_tests run_subtests |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
61 |
+ |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
62 |
+system_test :: pure_all run_system_tests run_system_subtests |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
63 |
EOF |
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
64 |
|
|
159f02dfcdd3
21613799 mod_perl upgrade to version 2.0.9 + provide Apache 2.4 module
Petr Sumbera <petr.sumbera@oracle.com>
parents:
diff
changeset
|
65 |
return $preamble; |