Change 16364 by jhi@alpha on 2002/05/03 02:22:56
Integrate macperl #16360 and #16363;
Make op/alarm.t pass
README.macos update
Affected files ...
.... //depot/perl/README.macos#6 integrate
.... //depot/perl/t/op/alarm.t#5 integrate
Differences ...
==== //depot/perl/README.macos#6 (text) ====
Index: perl/README.macos
--- perl/README.macos.~1~ Thu May 2 20:30:05 2002
+++ perl/README.macos Thu May 2 20:30:05 2002
@@ -19,9 +19,9 @@
=head1 DESCRIPTION
-The latest perl 5.6 source itself builds on Mac OS, with some additional
-pieces. Support for Mac OS is now in the perl core, and MacPerl will be
-able to, in the future, keep in closer sync with regular perl releases.
+The latest perl source itself builds on Mac OS, with some additional
+pieces. Support for Mac OS is now in the perl core, and MacPerl is kept
+in close sync with regular perl releases.
To build perl for Mac OS (as an MPW tool), you will need the addition
of the F<macos> subdirectory, distributed separately. It includes extra
@@ -38,8 +38,8 @@
http://dev.macperl.org/
-The source is also in the main perl repository in the maint-5.6/macperl
-branch.
+The source is also in the main perl repository in the macperl
+branch (the 5.6 source is in the maint-5.6/macperl branch).
You will also need compilers and libraries, all of them freely
available. These are linked to from the SourceForge site. Go that site
@@ -50,7 +50,7 @@
and 68030 computers.
MacPerl 5.2.0r4 is also available, on the CPAN and on SourceForge. It
-is based on perl 5.004.
+is based on perl 5.004, and works with Mac OS 7.5.5 and 68030 computers.
=head1 AUTHOR
@@ -62,4 +62,4 @@
=head1 DATE
-Last modified 2002.02.28.
+Last modified 2002.05.02.
==== //depot/perl/t/op/alarm.t#5 (text) ====
Index: perl/t/op/alarm.t
--- perl/t/op/alarm.t.~1~ Thu May 2 20:30:05 2002
+++ perl/t/op/alarm.t Thu May 2 20:30:05 2002
@@ -45,6 +45,7 @@
is( $@, "ALARM!\n", 'alarm w/$SIG{ALRM} vs system()' );
{
- local $TODO = 'Why does system() block alarm() on VMS?' if $^O eq 'VMS';
+ local $TODO = "Why does system() block alarm() on $^O?"
+ if $^O eq 'VMS' || $^O eq'MacOS';
ok( abs($diff - 3) <= 1, " right time (waited $diff secs for 3-sec alarm)" );
}
End of Patch.
