gozer 2004/02/09 14:20:53
Modified: t/conf extra.last.conf.in
Removed: t/conf perlsection.conf
Log:
To test recursive/re-entrant <Perl> sections, autogenerate the included file
instead of having to keep t/conf/perlsection.conf in CVS
Revision Changes Path
1.11 +4 -1 modperl-2.0/t/conf/extra.last.conf.in
Index: extra.last.conf.in
===================================================================
RCS file: /home/cvs/modperl-2.0/t/conf/extra.last.conf.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- extra.last.conf.in 19 Dec 2003 01:17:32 -0000 1.10
+++ extra.last.conf.in 9 Feb 2004 22:20:53 -0000 1.11
@@ -31,7 +31,10 @@
#Handle re-entrant <Perl> sections
<Perl >
-$Include = "@ServerRoot@/conf/perlsection.conf";
+ my $file = File::Spec->catfile('@ServerRoot@', 'conf', 'perlsection.conf');
+ my $conf = join "\n", qw(<Perl> $TestDirective::perl::Included++; </Perl>);
+ Apache::TestUtil::t_write_file($file, $conf);
This causes:
[Mon Feb 09 15:15:10 2004] [info] 5 APR:: modules loaded
[Mon Feb 09 15:15:10 2004] [info] base server + 15 vhosts ready to run tests
waiting 120 seconds for server to start: 00:03#
# writing file: /home/stas/apache.org/mp2-mutex/t/conf/perlsection.conf
waiting 120 seconds for server to start: 00:06# removing file: /home/stas/apache.org/mp2-mutex/t/conf/perlsection.conf
Use Apache::TestConfig::writefile instead?
__________________________________________________________________ Stas Bekman JAm_pH ------> Just Another mod_perl Hacker http://stason.org/ mod_perl Guide ---> http://perl.apache.org mailto:[EMAIL PROTECTED] http://use.perl.org http://apacheweek.com http://modperlbook.org http://apache.org http://ticketmaster.com
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
