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