Author: geoff Date: Thu Jan 27 20:24:29 2005 New Revision: 148851 URL: http://svn.apache.org/viewcvs?view=rev&rev=148851 Log: tidy
Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm?view=diff&rev=148851&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm&r1=148850&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm&r2=148851 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestHarnessPHP.pm Thu Jan 27 20:24:29 2005 @@ -31,14 +31,15 @@ my $phpclient = eval { require Test::Harness; Test::Harness->VERSION(2.38); + push @ISA, qw(Test::Harness::Straps); + $Test::Harness::Strap = __PACKAGE__->new; # yes, this is ugly, ugly, ugly $Test::Harness::Strap->{callback} = sub { my($self, $line, $type, $totals) = @_; print $line if $Test::Harness::Verbose; - my $meth = *Handlers{$type}; $meth->($self, $line, $type, $totals) if $meth; }; @@ -143,14 +144,14 @@ $ENV{SERVER_ROOT} = $server_root; my $conf = catfile($server_root, 'conf'); - + my $ini = catfile($conf, 'php.ini'); my $switches = join ' ', "--php-ini $ini", "--define include_path=$conf"; my $line = "php $switches $file"; - + return $line; } Modified: httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm Url: http://svn.apache.org/viewcvs/httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm?view=diff&rev=148851&p1=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm&r1=148850&p2=httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm&r2=148851 ============================================================================== --- httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm (original) +++ httpd/test/trunk/perl-framework/Apache-Test/lib/Apache/TestRunPHP.pm Thu Jan 27 20:24:29 2005 @@ -89,7 +89,7 @@ order => $self->{opts}->{order}, subtests => $self->{subtests} || [], }; - + if (grep { exists $self->{opts}->{$_} } @request_opts) { run_request($self->{test_config}, $self->{opts}); } @@ -101,11 +101,11 @@ sub split_test_args { my($self) = @_; - + my(@tests); my $top_dir = $self->{test_config}->{vars}->{top_dir}; my $t_dir = $self->{test_config}->{vars}->{t_dir}; - + my $argv = $self->{argv}; my @leftovers = (); for (@$argv) { @@ -138,14 +138,14 @@ if (/^(\d+)\.\.(\d+)$/) { @t = $1..$2; } - + push @{ $self->{subtests} }, @t; next; } } push @leftovers, $_; } - + $self->{tests} = [ map { canonpath($_) } @tests ]; $self->{argv} = [EMAIL PROTECTED]; }