cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestRun.pm

[randyk]

randyk      2004/01/13 20:21:46

  Modified:    perl-framework/Apache-Test/lib/Apache TestRun.pm
  Log:
  On Win32, search for Apache/Apache2 as the name of the httpd binary,
  rather than apache/apache2.
  
  Revision  Changes    Path
  1.139     +5 -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.138
  retrieving revision 1.139
  diff -u -r1.138 -r1.139
  --- TestRun.pm        11 Jan 2004 15:25:12 -0000      1.138
  +++ TestRun.pm        14 Jan 2004 04:21:46 -0000      1.139
  @@ -1343,11 +1343,14 @@
   
       {
           my %choices = ();
  +        my @tries = qw(httpd httpd2);
  +        # Win32 uses Apache or perhaps Apache2, not apache/apache2
  +        push @tries, Apache::TestConfig::WIN32 ?
  +            qw(Apache Apache2) : qw(apache apache2);
           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}, $ENV{APACHE2}, map {which($_)} @tries) {
               $choices{$_}++ if -e $_ && -x _;
           }
           my $optional = 0;