Lines 24-30
BEGIN {
Link Here
|
24 |
|
24 |
|
25 |
} |
25 |
} |
26 |
|
26 |
|
27 |
use lib qw(lib Apache-Test/lib); |
27 |
use lib qw(lib); |
28 |
|
28 |
|
29 |
use Config; |
29 |
use Config; |
30 |
use File::Spec::Functions; |
30 |
use File::Spec::Functions; |
Lines 117-132
sub get_DEFINE {
Link Here
|
117 |
} |
117 |
} |
118 |
|
118 |
|
119 |
sub configure { |
119 |
sub configure { |
120 |
|
|
|
121 |
# mod_perl test suite relies on having Apache-Test bundled with |
122 |
# the mod_perl source, since any pre-installed version may not do |
123 |
# the right thing |
124 |
unless (-d "Apache-Test") { |
125 |
error "Can't find a sub-directory Apache-Test. " . |
126 |
"Make sure that you are using a complete source distribution"; |
127 |
exit 1; |
128 |
} |
129 |
|
130 |
set_modperl_version(); |
120 |
set_modperl_version(); |
131 |
|
121 |
|
132 |
if ($old_modperl_version) { |
122 |
if ($old_modperl_version) { |
Lines 795-806
run_tests : test_clean
Link Here
|
795 |
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ |
785 |
$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ |
796 |
t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
786 |
t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) |
797 |
|
787 |
|
798 |
run_subtests :: |
|
|
799 |
cd ModPerl-Registry && $(MAKE) test |
800 |
|
801 |
run_subtests :: |
802 |
cd Apache-Reload && $(MAKE) test |
803 |
|
804 |
EOF |
788 |
EOF |
805 |
|
789 |
|
806 |
$preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
790 |
$preamble .= <<'EOF' unless $build->mpm_is_threaded(); |
Lines 816-851
EOF
Link Here
|
816 |
return $preamble; |
800 |
return $preamble; |
817 |
} |
801 |
} |
818 |
|
802 |
|
819 |
sub MY::postamble { |
|
|
820 |
my $self = shift; |
821 |
|
822 |
my $string = $self->ModPerl::BuildMM::MY::postamble; |
823 |
|
824 |
$string .= <<'EOF'; |
825 |
mydist : Apache-Test/META.yml mod_perl.spec manifest tardist |
826 |
|
827 |
rpm: dist |
828 |
@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm |
829 |
rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \ |
830 |
--define "_srcrpmdir $(PWD)/rpm" \ |
831 |
$(DISTVNAME).tar.gz |
832 |
@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/ |
833 |
@rm -rf $(PWD)/rpm/*/ |
834 |
|
835 |
mod_perl.spec: build/make_rpm_spec |
836 |
$(PERL) build/make_rpm_spec |
837 |
|
838 |
Apache-Test/META.yml: |
839 |
cd Apache-Test && make metafile |
840 |
|
841 |
tag : |
842 |
svn copy https://svn.apache.org/repos/asf/perl/modperl/branches/release/$(VERSION_SYM) https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM) |
843 |
svn copy https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM) |
844 |
EOF |
845 |
|
846 |
return $string; |
847 |
} |
848 |
|
849 |
# this is a workaround so that ModPerl::MM will move MY::constants |
803 |
# this is a workaround so that ModPerl::MM will move MY::constants |
850 |
# away, and Apache-Test/Makefile.PL which has its own MY::constants |
804 |
# away, and Apache-Test/Makefile.PL which has its own MY::constants |
851 |
# won't get complaints on MY::constants redefined |
805 |
# won't get complaints on MY::constants redefined |
852 |
- |
|
|