diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-06-05 00:07:15 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-06-05 00:07:15 +0000 |
| commit | 5b86572164387fde73051a7dd9281f0f2dbcc081 (patch) | |
| tree | 4f3ecbe89c7da06b85208ced535fed19e55b61c9 /lib/Test | |
| parent | efc3b6b58e3c8ae151afb5c494ee30cd4ecf7584 (diff) | |
| download | perl-5b86572164387fde73051a7dd9281f0f2dbcc081.tar.gz | |
Integrate macperl changes #16974 and #16975;
nativize() isn't happy with absolute Mac paths
Test::Harness test fixes, attempt #3 :-)
p4raw-link: @16974 on //depot/macperl: 594896ac796bb1aa12d08048b3e095be1cebc16d
p4raw-id: //depot/perl@16989
p4raw-integrated: from //depot/macperl@16987 'copy in'
ext/DynaLoader/DynaLoader_pm.PL (@16929..)
lib/ExtUtils/MM_MacOS.pm (@16938..)
lib/Test/Harness/t/callback.t
lib/Test/Harness/t/strap-analyze.t
lib/Test/Harness/t/test-harness.t lib/lib_pm.PL (@16968..)
Diffstat (limited to 'lib/Test')
| -rw-r--r-- | lib/Test/Harness/t/callback.t | 2 | ||||
| -rw-r--r-- | lib/Test/Harness/t/strap-analyze.t | 2 | ||||
| -rw-r--r-- | lib/Test/Harness/t/test-harness.t | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/Test/Harness/t/callback.t b/lib/Test/Harness/t/callback.t index eeea1e4ecd..74b2fe9e2e 100644 --- a/lib/Test/Harness/t/callback.t +++ b/lib/Test/Harness/t/callback.t @@ -57,7 +57,7 @@ $SAMPLE_TESTS = VMS::Filespec::unixify($SAMPLE_TESTS) if $^O eq 'VMS'; 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"); diff --git a/lib/Test/Harness/t/strap-analyze.t b/lib/Test/Harness/t/strap-analyze.t index 30d363dfa9..c3e3d1e13b 100644 --- a/lib/Test/Harness/t/strap-analyze.t +++ b/lib/Test/Harness/t/strap-analyze.t @@ -466,7 +466,7 @@ while( my($test, $expect) = each %samples ) { } 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"); diff --git a/lib/Test/Harness/t/test-harness.t b/lib/Test/Harness/t/test-harness.t index 3cb0abbb6b..1e9f58ddb5 100644 --- a/lib/Test/Harness/t/test-harness.t +++ b/lib/Test/Harness/t/test-harness.t @@ -433,7 +433,7 @@ while (my($test, $expect) = each %samples) { 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 @@ while (my($test, $expect) = each %samples) { 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}}}, |