- Timestamp:
- 09/06/05 00:41:05 (3 years ago)
- Location:
- inc/Test
- Files:
-
- 2 modified
-
Harness.pm (modified) (1 diff)
-
Harness/Straps.pm (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
inc/Test/Harness.pm
r2647 r6758 822 822 push @result, "\tFailed $failed/$max tests, "; 823 823 if ($max) { 824 push @result, sprintf("%.2f",100*(1-$failed/$max)), "% okay";824 push @result, sprintf("%.2f",100*(1-$failed/$max)), "% okay"; 825 825 } else { 826 push @result, "?% okay";826 push @result, "?% okay"; 827 827 } 828 828 my $ender = 's' x ($skipped > 1); 829 829 if ($skipped) { 830 830 my $good = $max - $failed - $skipped; 831 my $skipmsg = " (less $skipped skipped test$ender: $good okay, ";832 if ($max) {833 my $goodper = sprintf("%.2f",100*($good/$max));834 $skipmsg .= "$goodper%)";835 } else {836 $skipmsg .= "?%)";837 }838 push @result, $skipmsg;831 my $skipmsg = " (less $skipped skipped test$ender: $good okay, "; 832 if ($max) { 833 my $goodper = sprintf("%.2f",100*($good/$max)); 834 $skipmsg .= "$goodper%)"; 835 } else { 836 $skipmsg .= "?%)"; 837 } 838 push @result, $skipmsg; 839 839 } 840 840 push @result, "\n"; -
inc/Test/Harness/Straps.pm
r469 r6758 387 387 # MacPerl's putenv is broken, so it will not see PERL5LIB, tainted or not. 388 388 if ( $taint || $self->{_is_macos} ) { 389 my @inc = $self->_filtered_INC;390 push @derived_switches, map { "-I$_" } @inc;389 my @inc = $self->_filtered_INC; 390 push @derived_switches, map { "-I$_" } @inc; 391 391 } 392 392 … … 395 395 # it if it's already quoted. 396 396 for ( @derived_switches ) { 397 $_ = qq["$_"] if ((/\s/ || $self->{_is_vms}) && !/^".*"$/ );397 $_ = qq["$_"] if ((/\s/ || $self->{_is_vms}) && !/^".*"$/ ); 398 398 } 399 399 return join( " ", @existing_switches, @derived_switches ); … … 415 415 my @switches; 416 416 for ( @_ ) { 417 my $switch = $_;418 next unless defined $switch;419 $switch =~ s/^\s+//;420 $switch =~ s/\s+$//;421 push( @switches, $switch ) if $switch ne "";417 my $switch = $_; 418 next unless defined $switch; 419 $switch =~ s/^\s+//; 420 $switch =~ s/\s+$//; 421 push( @switches, $switch ) if $switch ne ""; 422 422 } 423 423 … … 456 456 457 457 if( $self->{_is_vms} ) { 458 # VMS has a 255-byte limit on the length of %ENV entries, so459 # toss the ones that involve perl_root, the install location458 # VMS has a 255-byte limit on the length of %ENV entries, so 459 # toss the ones that involve perl_root, the install location 460 460 @inc = grep !/perl_root/i, @inc; 461 461 462 462 } elsif ( $self->{_is_win32} ) { 463 # Lose any trailing backslashes in the Win32 paths464 s/[\\\/+]$// foreach @inc;463 # Lose any trailing backslashes in the Win32 paths 464 s/[\\\/+]$// foreach @inc; 465 465 } 466 466
