stas 2004/05/25 19:14:36
Modified: perl-framework/Apache-Test/lib/Apache TestRun.pm
perl-framework/Apache-Test Changes
Log:
Tweak Apache::TestRun to support test filenames starting with
/(.\\)?t\\/ prefixes, windows style (needed for t/SMOKE)
Revision Changes Path
1.170 +5 -5
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.169
retrieving revision 1.170
diff -u -u -r1.169 -r1.170
--- TestRun.pm 13 May 2004 01:09:26 -0000 1.169
+++ TestRun.pm 26 May 2004 02:14:36 -0000 1.170
@@ -29,7 +29,7 @@
use ExtUtils::MakeMaker;
use File::Find qw(finddepth);
use File::Path;
-use File::Spec::Functions qw(catfile catdir);
+use File::Spec::Functions qw(catfile catdir canonpath);
use File::Basename qw(basename dirname);
use Getopt::Long qw(GetOptions);
use Config;
@@ -150,9 +150,9 @@
my @leftovers = ();
for (@$argv) {
my $arg = $_;
- # need the t/ for stat-ing, but don't want to include it in
- # test output
- $arg =~ [EMAIL PROTECTED](?:\./)?t/@@;
+ # need the t/ (or t\) for stat-ing, but don't want to include
+ # it in test output
+ $arg =~ [EMAIL PROTECTED](?:\.[\\/])?t[\\/]@@;
my $file = catfile $t_dir, $arg;
if (-d $file and $_ ne '/') {
my @files = <$file/*.t>;
@@ -185,7 +185,7 @@
push @leftovers, $_;
}
- $self->{tests} = [EMAIL PROTECTED];
+ $self->{tests} = [ map { canonpath($_) } @tests ];
$self->{argv} = [EMAIL PROTECTED];
}
1.134 +3 -0 httpd-test/perl-framework/Apache-Test/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -u -r1.133 -r1.134
--- Changes 21 May 2004 18:29:51 -0000 1.133
+++ Changes 26 May 2004 02:14:36 -0000 1.134
@@ -10,6 +10,9 @@
=item 1.11 - May 21, 2004
+Tweak Apache::TestRun to support test filenames starting with
+/(.\\)?t\\/ prefixes, windows style (needed for t/SMOKE) [Steve Hay]
+
if we fail to match the Apache revision (which is OK at the early
stages, like 'perl Makefile.PL', default to a non-existing revision
0. But provide no more misleading defaults (used to default to
