httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestRun.pm
Date Sat, 10 Jan 2004 22:07:17 GMT
randyk      2004/01/10 14:07:17

  Modified:    perl-framework/Apache-Test/lib/Apache TestConfig.pm
                        TestRun.pm
  Log:
  On Win32, multiple options for Apache.exe can be returned which differ
  only by the case of the .exe extension or by the directory separator.
  These changes bring things into line with what is returned from which().
  
  Revision  Changes    Path
  1.198     +2 -2      httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm
  
  Index: TestConfig.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestConfig.pm,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -r1.197 -r1.198
  --- TestConfig.pm	8 Jan 2004 06:14:21 -0000	1.197
  +++ TestConfig.pm	10 Jan 2004 22:07:17 -0000	1.198
  @@ -306,7 +306,7 @@
       my $self = shift;
       my $vars = $self->{vars};
   
  -    $vars->{target} ||= (WIN32 ? 'Apache.exe' : 'httpd');
  +    $vars->{target} ||= (WIN32 ? 'Apache.EXE' : 'httpd');
   
       unless ($vars->{httpd}) {
           #sbindir should be bin/ with the default layout
  @@ -516,7 +516,7 @@
       if (my $build_config = modperl_build_config()) {
           if (my $p = $build_config->{MP_AP_PREFIX}) {
               for my $bindir (qw(bin sbin)) {
  -                my $httpd = "$p/$bindir/$vars->{target}";
  +                my $httpd = catfile $p, $bindir, $vars->{target};
                   return $httpd if -e $httpd;
               }
           }
  
  
  
  1.136     +2 -2      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.135
  retrieving revision 1.136
  diff -u -r1.135 -r1.136
  --- TestRun.pm	8 Jan 2004 04:54:06 -0000	1.135
  +++ TestRun.pm	10 Jan 2004 22:07:17 -0000	1.136
  @@ -1346,8 +1346,8 @@
           for (grep defined $_,
                map({ catfile $vars->{$_}, $vars->{target} } qw(sbindir bindir)),
                $test_config->default_httpd, which($vars->{target}),
  -             $ENV{APACHE},  which('apache'),  which('httpd'),
  -             $ENV{APACHE2}, which('apache2'), which('httpd2')) {
  +             $ENV{APACHE},  which('Apache'),  which('httpd'),
  +             $ENV{APACHE2}, which('Apache2'), which('httpd2')) {
               $choices{$_}++ if -e $_ && -x _;
           }
           my $optional = 0;
  
  
  

Mime
View raw message