You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ph...@apache.org on 2010/06/23 21:06:13 UTC

svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Author: phred
Date: Wed Jun 23 19:06:12 2010
New Revision: 957309

URL: http://svn.apache.org/viewvc?rev=957309&view=rev
Log:
Run tests on bundled pure perl modules.

Written by: Phred, Gozer
Reviewed by: Adam Prime, Gozer, Phred, Pgollucci
Tested by: Phred

Modified:
    perl/modperl/trunk/Changes
    perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=957309&r1=957308&r2=957309&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Wed Jun 23 19:06:12 2010
@@ -12,6 +12,8 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.5-dev
 
+Run tests on bundled pure perl Apache::* modules [Gozer, Phred]
+
 Implement a mini-preprocess language for map-files in xs/maps.
 [Torsten Foertsch]
 

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=957309&r1=957308&r2=957309&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Wed Jun 23 19:06:12 2010
@@ -785,7 +785,16 @@ run_tests : test_clean
 	$(PASSENV) \
 	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
 	t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
-	cd ModPerl-Registry && $(MAKE) test
+	$(MAKE) -k run_subtests
+
+run_subtests ::
+	$(MAKE) -C ModPerl-Registry test
+
+run_subtests ::
+	$(MAKE) -C Apache-Reload test
+
+run_subtests ::
+	$(MAKE) -C Apache-SizeLimit test
 
 test :: pure_all run_tests test_clean
 EOF



Re: svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Posted by Fred Moyer <fr...@redhotpenguin.com>.
On Wed, Jun 30, 2010 at 11:56 AM, Philippe M. Chiasson
<go...@ectoplasm.org> wrote:
>
> Reminds me of something else, are we correctly generating the META.yml
> exceptions for these modules, so the CPAN indexer doesn't index them?

No - how does this look?  META.yml does not look to be auto-generated,
it hasn't been updated in about a year.

Index: META.yml
===================================================================
--- META.yml    (revision 959178)
+++ META.yml    (working copy)
@@ -4,8 +4,10 @@
 distribution_type: module
 no_index:
     directory:
-          # A-T has its own CPAN distro
+          # A-T and others have their own CPAN distros
         - Apache-Test
+        - Apache-Reload
+        - Apache-SizeLimit
     package:
           # Internally redefined module
         - C::Preprocessed

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Posted by Fred Moyer <fr...@redhotpenguin.com>.
On Wed, Jun 30, 2010 at 6:30 PM, Philip M. Gollucci
<pg...@p6m7g8.com> wrote:
> On 6/30/2010 2:56 PM, Philippe M. Chiasson wrote:
>> On 10-06-30 01:01 , Fred Moyer wrote:

>>> If we want the distro to include released versions, that will mean
>>> that those bundled modules will need to be svn updated to the stable
>>> tags before building the bundled distribution.  That or update the
>>> release procedures for the bundled modules and do dev on branches - I
>>> like that solution less.
> If we do this right (ala httpd,apr et al).
> You'll create an svn branch branches/2.0.5 or similiar. Then you update
> the externals to point at the tags you want in the release.
>
> Pick a revision, edit date info, tag it vote.
>
> IIRC harmony creates the tgz from a specific rev, votes, then tags.

I really like this approach.  Once I resolve the META.yml exceptions
for included modules I think we are ready to roll 2.0.5 rc.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org


Re: svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Posted by "Philip M. Gollucci" <pg...@p6m7g8.com>.
On 6/30/2010 2:56 PM, Philippe M. Chiasson wrote:
> On 10-06-30 01:01 , Fred Moyer wrote:
>> As a follow up to this commit, I discussed additional steps needed on
>> IRC with Gozer.  He asked me to check make dist to be sure that it
>> generated the correct MANIFEST which included the bundled
>> Apache-SizeLimit and Apache-Reload modules.  I just went over that
>> issue and the distribution includes the desired pure perl modules.
>> make rpm appears to include those modules also.
>>
>> However, those included modules are using -dev versions (A:T 1.33-dev
>> for example) :(
>>
>> If we want the distro to include released versions, that will mean
>> that those bundled modules will need to be svn updated to the stable
>> tags before building the bundled distribution.  That or update the
>> release procedures for the bundled modules and do dev on branches - I
>> like that solution less.
If we do this right (ala httpd,apr et al).
You'll create an svn branch branches/2.0.5 or similiar. Then you update
the externals to point at the tags you want in the release.

Pick a revision, edit date info, tag it vote.

IIRC harmony creates the tgz from a specific rev, votes, then tags.

Either way is fine.

Feel free to mod the process.  Its been 4 yrs since I've even looked at it.

-- 
------------------------------------------------------------------------
1024D/DB9B8C1C B90B FBC3 A3A1 C71A 8E70  3F8C 75B8 8FFB DB9B 8C1C
Philip M. Gollucci (pgollucci@p6m7g8.com) c: 703.336.9354
VP Apache Infrastructure; Member, Apache Software Foundation
Committer,                        FreeBSD Foundation
Consultant,                       P6M7G8 Inc.
Sr. System Admin,                 Ridecharge Inc.

Work like you don't need the money,
love like you'll never get hurt,
and dance like nobody's watching.


Re: svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
On 10-06-30 01:01 , Fred Moyer wrote:
> As a follow up to this commit, I discussed additional steps needed on
> IRC with Gozer.  He asked me to check make dist to be sure that it
> generated the correct MANIFEST which included the bundled
> Apache-SizeLimit and Apache-Reload modules.  I just went over that
> issue and the distribution includes the desired pure perl modules.
> make rpm appears to include those modules also.
> 
> However, those included modules are using -dev versions (A:T 1.33-dev
> for example) :(
> 
> If we want the distro to include released versions, that will mean
> that those bundled modules will need to be svn updated to the stable
> tags before building the bundled distribution.  That or update the
> release procedures for the bundled modules and do dev on branches - I
> like that solution less.

Or follow a similar path to what we do with Apache-Test. Not sure that's
going to scale very well, unfortunately.

Probably better to pick the last released tag for these and use that in
the produced tarball.

Reminds me of something else, are we correctly generating the META.yml
exceptions for these modules, so the CPAN indexer doesn't index them?

-- 
Philippe M. Chiasson     GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/       m/gozer\@(apache|cpan|ectoplasm)\.org/


Re: svn commit: r957309 - in /perl/modperl/trunk: Changes Makefile.PL

Posted by Fred Moyer <fr...@redhotpenguin.com>.
As a follow up to this commit, I discussed additional steps needed on
IRC with Gozer.  He asked me to check make dist to be sure that it
generated the correct MANIFEST which included the bundled
Apache-SizeLimit and Apache-Reload modules.  I just went over that
issue and the distribution includes the desired pure perl modules.
make rpm appears to include those modules also.

However, those included modules are using -dev versions (A:T 1.33-dev
for example) :(

If we want the distro to include released versions, that will mean
that those bundled modules will need to be svn updated to the stable
tags before building the bundled distribution.  That or update the
release procedures for the bundled modules and do dev on branches - I
like that solution less.

Thoughts?

On Wed, Jun 23, 2010 at 12:06 PM,  <ph...@apache.org> wrote:
> Author: phred
> Date: Wed Jun 23 19:06:12 2010
> New Revision: 957309
>
> URL: http://svn.apache.org/viewvc?rev=957309&view=rev
> Log:
> Run tests on bundled pure perl modules.
>
> Written by: Phred, Gozer
> Reviewed by: Adam Prime, Gozer, Phred, Pgollucci
> Tested by: Phred
>
> Modified:
>    perl/modperl/trunk/Changes
>    perl/modperl/trunk/Makefile.PL
>
> Modified: perl/modperl/trunk/Changes
> URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=957309&r1=957308&r2=957309&view=diff
> ==============================================================================
> --- perl/modperl/trunk/Changes (original)
> +++ perl/modperl/trunk/Changes Wed Jun 23 19:06:12 2010
> @@ -12,6 +12,8 @@ Also refer to the Apache::Test changes l
>
>  =item 2.0.5-dev
>
> +Run tests on bundled pure perl Apache::* modules [Gozer, Phred]
> +
>  Implement a mini-preprocess language for map-files in xs/maps.
>  [Torsten Foertsch]
>
>
> Modified: perl/modperl/trunk/Makefile.PL
> URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=957309&r1=957308&r2=957309&view=diff
> ==============================================================================
> --- perl/modperl/trunk/Makefile.PL (original)
> +++ perl/modperl/trunk/Makefile.PL Wed Jun 23 19:06:12 2010
> @@ -785,7 +785,16 @@ run_tests : test_clean
>        $(PASSENV) \
>        $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
>        t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
> -       cd ModPerl-Registry && $(MAKE) test
> +       $(MAKE) -k run_subtests
> +
> +run_subtests ::
> +       $(MAKE) -C ModPerl-Registry test
> +
> +run_subtests ::
> +       $(MAKE) -C Apache-Reload test
> +
> +run_subtests ::
> +       $(MAKE) -C Apache-SizeLimit test
>
>  test :: pure_all run_tests test_clean
>  EOF
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org