Randy Kobes wrote:
On Wed, 12 Oct 2005, Christopher H. Laco wrote:
Philip M. Gollucci wrote:
[ ... ]
The other test is because the executable name doesn't match.
Randy committed Steve's patch for this and this will be in RC2 and 2.0.2
release.
t/directive/perldo.t 16 1 6.25% 12
# testing : $0
# expected: (?-xism:httpd)
# received: /usr/sbin/apache2
not ok 12
Cool!
Actually, I think the above failure requires a further
patch - the one I committed was to allow for Apache.exe
to be the name of the binary, but apparently for this
one also has to accept "apache2" as the name. The
following diff from the current svn should work:
=====================================================
Index: t/response/TestDirective/perldo.pm
===================================================================
--- t/response/TestDirective/perldo.pm (revision 315047)
+++ t/response/TestDirective/perldo.pm (working copy)
@@ -40,7 +40,7 @@
ok $TestDirective::perl::line > 3;
ok !t_cmp($0, '-e', '$0');
- ok t_cmp($0, qr/httpd|apache\.exe/i, '$0');
+ ok t_cmp($0, qr/httpd|apache\.exe|apache2/i, '$0');
ok t_cmp($TestDirective::perl::Included, 1, "Include");
============================================================
shouldn't it be:
Index: t/response/TestDirective/perldo.pm
===================================================================
--- t/response/TestDirective/perldo.pm (revision 312991)
+++ t/response/TestDirective/perldo.pm (working copy)
@@ -40,7 +40,8 @@
ok $TestDirective::perl::line > 3;
ok !t_cmp($0, '-e', '$0');
- ok t_cmp($0, qr/httpd|apache\.exe/i, '$0');
+ my $target = Apache::Test::vars('target');
+ ok t_cmp($0, qr/$target/i, '$0');
ok t_cmp($TestDirective::perl::Included, 1, "Include");
target is the name of the httpd executable and it can be changed from the
command line:
t/TEST -target=http2005d
in which case the hardcoded test will break :)
--
_____________________________________________________________
Stas Bekman mailto:[EMAIL PROTECTED] http://stason.org/
MailChannels: Assured Messaging(TM) http://mailchannels.com/
The "Practical mod_perl" book http://modperlbook.org/
http://perl.apache.org/ http://perl.org/ http://logilune.com/
