You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by st...@apache.org on 2004/02/09 19:07:49 UTC
cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm TestSSLCA.pm
stas 2004/02/09 10:07:49
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
TestSSLCA.pm
Log:
more t/ related fixes
Revision Changes Path
1.148 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm
Index: TestRun.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestRun.pm,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -u -r1.147 -r1.148
--- TestRun.pm 3 Feb 2004 00:23:34 -0000 1.147
+++ TestRun.pm 9 Feb 2004 18:07:49 -0000 1.148
@@ -250,7 +250,7 @@
$self->{reconfigure} = $opts{configure} ||
(grep { $opts{$_}->[0] } qw(preamble postamble)) ||
(grep { $Apache::TestConfig::Usage{$_} } keys %conf_opts ) ||
- $self->passenv() || (! -e 'conf/httpd.conf');
+ $self->passenv() || (! -e 't/conf/httpd.conf');
if (exists $opts{debug}) {
$opts{debugger} = $opts{debug};
1.16 +1 -1 httpd-test/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm
Index: TestSSLCA.pm
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- TestSSLCA.pm 8 Jan 2004 17:15:37 -0000 1.15
+++ TestSSLCA.pm 9 Feb 2004 18:07:49 -0000 1.16
@@ -170,7 +170,7 @@
sub config_file {
my $name = shift;
- my $file = "conf/$name.cnf";
+ my $file = "t/conf/$name.cnf";
return $file if -e $file;
my $dn = dn($name);
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestRun.pm TestSSLCA.pm
Posted by Stas Bekman <st...@stason.org>.
Joe Orton wrote:
> Oh, I see I just undid your commit. Did this really work for you?
>
> I was always getting, from a clean checkout:
>
> [warning] setting ulimit to allow core files
> ulimit -c unlimited; /usr/bin/perl ./t/TEST
> [warning] generating SSL CA for asf
> [ error] configure() has failed:
> open t/conf/ca.cnf: No such file or directory at /blah/TestSSLCA.pm line 494.
>
> [warning] forcing Apache::TestConfig object save
> [warning] run 't/TEST -clean' to clean up before continuing
No, I think yours is right. I guess I had the ssl conf cached so I didn't
notice that, when doing a batch of fixes. Thanks for the fix, Joe.
> On Mon, Feb 09, 2004 at 06:07:49PM -0000, stas@apache.org wrote:
>
>> --- TestSSLCA.pm 8 Jan 2004 17:15:37 -0000 1.15
>> +++ TestSSLCA.pm 9 Feb 2004 18:07:49 -0000 1.16
>> @@ -170,7 +170,7 @@
>> sub config_file {
>> my $name = shift;
>>
>> - my $file = "conf/$name.cnf";
>> + my $file = "t/conf/$name.cnf";
>> return $file if -e $file;
>>
>> my $dn = dn($name);
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm TestSSLCA.pm
Posted by Joe Orton <jo...@redhat.com>.
Oh, I see I just undid your commit. Did this really work for you?
I was always getting, from a clean checkout:
[warning] setting ulimit to allow core files
ulimit -c unlimited; /usr/bin/perl ./t/TEST
[warning] generating SSL CA for asf
[ error] configure() has failed:
open t/conf/ca.cnf: No such file or directory at /blah/TestSSLCA.pm line 494.
[warning] forcing Apache::TestConfig object save
[warning] run 't/TEST -clean' to clean up before continuing
On Mon, Feb 09, 2004 at 06:07:49PM -0000, stas@apache.org wrote:
> --- TestSSLCA.pm 8 Jan 2004 17:15:37 -0000 1.15
> +++ TestSSLCA.pm 9 Feb 2004 18:07:49 -0000 1.16
> @@ -170,7 +170,7 @@
> sub config_file {
> my $name = shift;
>
> - my $file = "conf/$name.cnf";
> + my $file = "t/conf/$name.cnf";
> return $file if -e $file;
>
> my $dn = dn($name);
>
>
>
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestRun.pm TestSSLCA.pm
Posted by Stas Bekman <st...@stason.org>.
Stas Bekman wrote:
> stas@apache.org wrote:
>
>> stas 2004/02/09 10:07:49
>>
>> Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
>> TestSSLCA.pm
>> Log:
>> more t/ related fixes
>
>
>> $self->{reconfigure} = $opts{configure} ||
>> (grep { $opts{$_}->[0] } qw(preamble postamble)) ||
>> (grep { $Apache::TestConfig::Usage{$_} } keys %conf_opts ) ||
>> - $self->passenv() || (! -e 'conf/httpd.conf');
>> + $self->passenv() || (! -e 't/conf/httpd.conf');
>
> [...]
>
>> - my $file = "conf/$name.cnf";
>> + my $file = "t/conf/$name.cnf";
>
>
> we probably need to add a chdir_top call which used to be chdir_t, so
> that 'TEST' will work in addition to 't/TEST". chdir_top should make
> sure we are outside of 't'.
I've added that functionality.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache
TestRun.pm TestSSLCA.pm
Posted by Stas Bekman <st...@stason.org>.
stas@apache.org wrote:
> stas 2004/02/09 10:07:49
>
> Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
> TestSSLCA.pm
> Log:
> more t/ related fixes
> $self->{reconfigure} = $opts{configure} ||
> (grep { $opts{$_}->[0] } qw(preamble postamble)) ||
> (grep { $Apache::TestConfig::Usage{$_} } keys %conf_opts ) ||
> - $self->passenv() || (! -e 'conf/httpd.conf');
> + $self->passenv() || (! -e 't/conf/httpd.conf');
[...]
> - my $file = "conf/$name.cnf";
> + my $file = "t/conf/$name.cnf";
we probably need to add a chdir_top call which used to be chdir_t, so that
'TEST' will work in addition to 't/TEST". chdir_top should make sure we are
outside of 't'.
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com