Change 16975 by pudge@pudge-mobile on 2002/06/02 17:19:29 Test::Harness test fixes, attempt #3 :-)
Affected files ... .... //depot/macperl/lib/Test/Harness/t/callback.t#6 edit .... //depot/macperl/lib/Test/Harness/t/strap-analyze.t#11 edit .... //depot/macperl/lib/Test/Harness/t/test-harness.t#11 edit Differences ... ==== //depot/macperl/lib/Test/Harness/t/callback.t#6 (text) ==== Index: macperl/lib/Test/Harness/t/callback.t --- macperl/lib/Test/Harness/t/callback.t#5~16968~ Sat Jun 1 11:55:49 2002 +++ macperl/lib/Test/Harness/t/callback.t Sun Jun 2 10:19:29 2002 @@ -57,7 +57,7 @@ while( my($test, $expect) = each %samples ) { local @out = (); - $strap->analyze_file($^O eq 'macos' ? + $strap->analyze_file($^O eq 'MacOS' ? catfile($SAMPLE_TESTS, $test) : "$SAMPLE_TESTS/$test"); ==== //depot/macperl/lib/Test/Harness/t/strap-analyze.t#11 (text) ==== Index: macperl/lib/Test/Harness/t/strap-analyze.t --- macperl/lib/Test/Harness/t/strap-analyze.t#10~16968~ Sat Jun 1 11:55:49 2002 +++ macperl/lib/Test/Harness/t/strap-analyze.t Sun Jun 2 10:19:29 2002 @@ -466,7 +466,7 @@ } my $strap = Test::Harness::Straps->new; - my %results = $strap->analyze_file($^O eq 'macos' ? + my %results = $strap->analyze_file($^O eq 'MacOS' ? catfile($SAMPLE_TESTS, $test) : "$SAMPLE_TESTS/$test"); ==== //depot/macperl/lib/Test/Harness/t/test-harness.t#11 (text) ==== Index: macperl/lib/Test/Harness/t/test-harness.t --- macperl/lib/Test/Harness/t/test-harness.t#10~16968~ Sat Jun 1 11:55:49 2002 +++ macperl/lib/Test/Harness/t/test-harness.t Sun Jun 2 10:19:29 2002 @@ -433,7 +433,7 @@ select NULL; # _run_all_tests() isn't as quiet as it should be. local $SIG{__WARN__} = sub { $warning .= join '', @_; }; ($totals, $failed) = - Test::Harness::_run_all_tests($^O eq 'macos' ? + Test::Harness::_run_all_tests($^O eq 'MacOS' ? catfile($SAMPLE_TESTS, $test) : "$SAMPLE_TESTS/$test"); }; @@ -453,7 +453,7 @@ is_deeply( {map { $_=>$totals->{$_} } keys %{$expect->{total}}}, $expect->{total}, "$test - totals" ); - is_deeply( {map { $_=>$failed->{$^O eq 'macos' ? + is_deeply( {map { $_=>$failed->{$^O eq 'MacOS' ? catfile($SAMPLE_TESTS, $test) : "$SAMPLE_TESTS/$test"}{$_} } keys %{$expect->{failed}}}, End of Patch.