[patch] mod_perl-2.0.5-r1302463-bundled-Apache-Test.patch

mod_perl-2.0.5-r1302463-bundled-Apache-Test.patch (text/plain), 2.53 KB, created by Martin Jansa on 2012-04-03 17:58:58 UTC

From 39bc8331b24455332bc0f71b331b5be093135d60 Mon Sep 17 00:00:00 2001
From: Martin Jansa <[e-mail]>
Date: Tue, 3 Apr 2012 19:07:34 +0200
Subject: [PATCH] disable bundled Apache-Test

Signed-off-by: Martin Jansa <[e-mail]>
---
 Makefile.PL |   48 +-----------------------------------------------
 1 files changed, 1 insertions(+), 47 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index c4a0430..d1fc802 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -24,7 +24,7 @@ BEGIN {
 
 }
 
-use lib qw(lib Apache-Test/lib);
+use lib qw(lib);
 
 use Config;
 use File::Spec::Functions;
@@ -117,16 +117,6 @@ sub get_DEFINE {
 }
 
 sub configure {
-
-    # mod_perl test suite relies on having Apache-Test bundled with
-    # the mod_perl source, since any pre-installed version may not do
-    # the right thing
-    unless (-d "Apache-Test") {
-        error "Can't find a sub-directory Apache-Test. " .
-            "Make sure that you are using a complete source distribution";
-        exit 1;
-    }
-
     set_modperl_version();
 
     if ($old_modperl_version) {
@@ -795,12 +785,6 @@ run_tests : test_clean
 	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
 	t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
 
-run_subtests ::
-	cd ModPerl-Registry && $(MAKE) test
-
-run_subtests ::
-	cd Apache-Reload && $(MAKE) test
-
 EOF
 
     $preamble .= <<'EOF' unless $build->mpm_is_threaded();
@@ -816,36 +800,6 @@ EOF
     return $preamble;
 }
 
-sub MY::postamble {
-    my $self = shift;
-
-    my $string = $self->ModPerl::BuildMM::MY::postamble;
-
-    $string .= <<'EOF';
-mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
-
-rpm: dist
-	@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
-	rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
-                 --define "_srcrpmdir $(PWD)/rpm" \
-                 $(DISTVNAME).tar.gz
-	@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
-	@rm -rf $(PWD)/rpm/*/
-    
-mod_perl.spec: build/make_rpm_spec
-	$(PERL) build/make_rpm_spec
-
-Apache-Test/META.yml:
-	cd Apache-Test && make metafile
-
-tag :
-	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)
-	svn copy  https://svn.apache.org/repos/asf/perl/modperl/docs/trunk https://svn.apache.org/repos/asf/perl/modperl/docs/tags/$(VERSION_SYM)
-EOF
-
-    return $string;
-}
-
 # this is a workaround so that ModPerl::MM will move MY::constants
 # away, and Apache-Test/Makefile.PL which has its own MY::constants
 # won't get complaints on MY::constants redefined
-- 
1.7.8.5