Return-Path: 
 <modperl-cvs-return-2976-apmail-modperl-cvs-archive=apache.org@apache.org>
Delivered-To: apmail-modperl-cvs-archive@apache.org
Received: (qmail 44842 invoked by uid 500); 23 Jan 2003 05:16:31 -0000
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:modperl-cvs-help@apache.org>
list-unsubscribe: <mailto:modperl-cvs-unsubscribe@apache.org>
list-post: <mailto:modperl-cvs@perl.apache.org>
Reply-To: dev@perl.apache.org
Delivered-To: mailing list modperl-cvs@apache.org
Received: (qmail 44831 invoked by uid 500); 23 Jan 2003 05:16:31 -0000
Delivered-To: apmail-modperl-2.0-cvs@apache.org
Date: 23 Jan 2003 05:16:30 -0000
Message-ID: <20030123051630.94556.qmail@icarus.apache.org>
From: stas@apache.org
To: modperl-2.0-cvs@apache.org
Subject: cvs commit: modperl-2.0 Makefile.PL Changes
X-Spam-Rating: 208.185.179.12.available.above.net 1.6.2 0/1000/N

stas        2003/01/22 21:16:30

  Modified:    .        Makefile.PL Changes
  Log:
  the top level 'make test' now descends into the ModPerl-Registry dir
  to run 'make test' there
  
  Revision  Changes    Path
  1.90      +24 -1     modperl-2.0/Makefile.PL
  
  Index: Makefile.PL
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- Makefile.PL	11 Jan 2003 03:20:54 -0000	1.89
  +++ Makefile.PL	23 Jan 2003 05:16:30 -0000	1.90
  @@ -29,7 +29,6 @@
   use Apache::TestReportPerl ();
   use Apache::TestSmokePerl ();
   use Apache::TestTrace;
  -use Apache::TestMM qw(test);
   use ModPerl::TestRun ();
   use ModPerl::Code ();
   use ModPerl::MM ();
  @@ -442,6 +441,30 @@
       ModPerl::MM::add_dep(\$string, clean => 'modperl_src_clean');
       ModPerl::MM::add_dep(\$string, clean => 'test_clean');
       $string;
  +}
  +
  +sub MY::test {
  +
  +    my $env = Apache::TestConfig->passenv_makestr();
  +
  +    my $preamble = Apache::TestConfig::WIN32 ? "" : <<EOF;
  +PASSENV = $env
  +EOF
  +
  +    return $preamble . <<'EOF';
  +test_clean :
  +	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
  +	t/TEST -clean
  +	
  +run_tests : test_clean
  +	$(PASSENV) \
  +	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
  +	t/TEST
  +	cd ModPerl-Registry && make test
  +
  +test :: pure_all run_tests test_clean
  +EOF
  +
   }
   
   sub MY::postamble {
  
  
  
  1.112     +3 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- Changes	23 Jan 2003 04:06:38 -0000	1.111
  +++ Changes	23 Jan 2003 05:16:30 -0000	1.112
  @@ -10,6 +10,9 @@
   
   =item 1.99_09-dev
   
  +the top level 'make test' now descend into the ModPerl-Registry dir
  +to run 'make test' there [Stas]
  +
   Apache::Test: don't inherit loading of the mod_perl object from the
   system-wide config, since we already add it [Stas]