Author: torsten
Date: Fri Mar 4 08:06:49 2011
New Revision: 1077842
URL: http://svn.apache.org/viewvc?rev=1077842&view=rev
Log:
Merged revisions 1076733 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r1076733 | torsten | 2011-03-03 20:16:25 +0100 (Thu, 03 Mar 2011) | 1 line
skip Apache2::SizeLimit tests for threaded MPMs
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Makefile.PL
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 4 08:06:49 2011
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 4 08:06:49 2011
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-1075785
+/perl/modperl/trunk:1-712967,712969-1076790
Modified: perl/modperl/branches/threading/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Makefile.PL?rev=1077842&r1=1077841&r2=1077842&view=diff
==============================================================================
--- perl/modperl/branches/threading/Makefile.PL (original)
+++ perl/modperl/branches/threading/Makefile.PL Fri Mar 4 08:06:49 2011
@@ -777,7 +777,7 @@ PASSENV = $env
EOF
}
- return $preamble . <<'EOF';
+ $preamble .= <<'EOF';
TEST_VERBOSE = 0
TEST_FILES =
@@ -797,12 +797,19 @@ run_subtests ::
run_subtests ::
$(MAKE) -C Apache-Reload test
+EOF
+
+ $preamble .= <<'EOF' unless $build->mpm_is_threaded();
run_subtests ::
$(MAKE) -C Apache-SizeLimit test
+EOF
+
+ $preamble .= <<'EOF';
test :: pure_all run_tests test_clean
EOF
+ return $preamble;
}
sub MY::postamble {
