On Sat, Jun 22, 2002 at 05:36:22PM -0400, Chris Nandor wrote:
> Please integrate changes into perl.
The changes to strap-analyze.t are unnecessary. The tests of the exit value
should be skipped on MacPerl so it doesn't matter what the value of
$die_exit is.
test-harness.t does use the $die_estat value, although it probably should
just skip the test. Did you just mirror the changes into strap-analyze, or
were you having a real failure?
I'll tweak these and integrate them into Test::Harness 2.27
PS I prefer "MacPerl" over "MacOS" just to better clarify it's a Classic bug
and not OS X.
> ==== //depot/macperl/lib/Test/Harness/t/strap-analyze.t#13 (text) ====
> Index: macperl/lib/Test/Harness/t/strap-analyze.t
> --- macperl/lib/Test/Harness/t/strap-analyze.t#12~17344~ Sat Jun 22 10:13:16
>2002
> +++ macperl/lib/Test/Harness/t/strap-analyze.t Sat Jun 22 10:30:12 2002
> @@ -20,11 +20,11 @@
> : File::Spec->catdir($Curdir, 't', 'sample-tests');
>
>
> -my $IsMacPerl = $^O eq 'MacOS';
> +my $IsMacOS = $^O eq 'MacOS';
> my $IsVMS = $^O eq 'VMS';
>
> # VMS uses native, not POSIX, exit codes.
> -my $die_exit = $IsVMS ? 44 : 1;
> +my $die_exit = $IsVMS ? 44 : $IsMacOS ? 0 : 1;
>
> # We can only predict that the wait status should be zero or not.
> my $wait_non_zero = 1;
> @@ -470,7 +470,7 @@
> delete $results{details};
>
> SKIP: {
> - skip '$? unreliable in MacPerl', 2 if $IsMacPerl;
> + skip '$? unreliable in MacPerl', 2 if $IsMacOS;
>
> # We can only check if it's zero or non-zero.
> is( !!$results{'wait'}, !!$expect->{'wait'}, 'wait status' );
>
> ==== //depot/macperl/lib/Test/Harness/t/test-harness.t#13 (text) ====
> Index: macperl/lib/Test/Harness/t/test-harness.t
> --- macperl/lib/Test/Harness/t/test-harness.t#12~17344~ Sat Jun 22 10:13:16
>2002
> +++ macperl/lib/Test/Harness/t/test-harness.t Sat Jun 22 10:30:12 2002
> @@ -40,11 +40,11 @@
>
> use Test::More;
>
> -my $IsMacPerl = $^O eq 'MacOS';
> +my $IsMacOS = $^O eq 'MacOS';
> my $IsVMS = $^O eq 'VMS';
>
> # VMS uses native, not POSIX, exit codes.
> -my $die_estat = $IsVMS ? 44 : 1;
> +my $die_estat = $IsVMS ? 44 : $IsMacOS ? 0 : 1;
>
> my %samples = (
> simple => {
> @@ -439,7 +439,7 @@
> select STDOUT;
>
> # $? is unreliable in MacPerl, so we'll simply fudge it.
> - $failed->{estat} = $die_estat if $IsMacPerl and $failed;
> + $failed->{estat} = $die_estat if $IsMacOS and $failed;
>
> SKIP: {
> skip "special tests for bailout", 1 unless $test eq 'bailout';
> End of Patch.
>
>
--
This sig file temporarily out of order.
