From test-dev-return-2271-apmail-httpd-test-dev-archive=httpd.apache.org@httpd.apache.org Sun Jan 11 04:34:53 2004 Return-Path: Delivered-To: apmail-httpd-test-dev-archive@www.apache.org Received: (qmail 99766 invoked from network); 11 Jan 2004 04:34:52 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 11 Jan 2004 04:34:52 -0000 Received: (qmail 30964 invoked by uid 500); 11 Jan 2004 04:34:33 -0000 Delivered-To: apmail-httpd-test-dev-archive@httpd.apache.org Received: (qmail 30939 invoked by uid 500); 11 Jan 2004 04:34:32 -0000 Mailing-List: contact test-dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: test-dev@httpd.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list test-dev@httpd.apache.org Received: (qmail 30926 invoked from network); 11 Jan 2004 04:34:32 -0000 Received: from unknown (HELO mail.logilune.com) (195.154.174.52) by daedalus.apache.org with SMTP; 11 Jan 2004 04:34:32 -0000 Received: from stason.org (localhost.logilune.com [127.0.0.1]) by mail.logilune.com (Postfix) with ESMTP id 360C379868 for ; Sun, 11 Jan 2004 05:34:41 +0100 (CET) Message-ID: <4000D583.601@stason.org> Date: Sat, 10 Jan 2004 20:48:03 -0800 From: Stas Bekman Organization: Hope, Humanized User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031010 X-Accept-Language: en-us, en, he, ru MIME-Version: 1.0 To: test-dev@httpd.apache.org Subject: Re: cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache TestConfig.pm TestRun.pm References: <20040110220717.7709.qmail@minotaur.apache.org> In-Reply-To: <20040110220717.7709.qmail@minotaur.apache.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N randyk@apache.org wrote: > 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(). [...] > 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; yes, but we need which('apache') too for unix. so please: - $ENV{APACHE}, which('apache'), which('httpd'), - $ENV{APACHE2}, which('apache2'), which('httpd2')) { + $ENV{APACHE}, which('apache'), which('Apache'), which('httpd'), + $ENV{APACHE2}, which('apache2'), which('Apache2'), which('httpd2')) { __________________________________________________________________ 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