diff options
| author | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-03 02:22:56 +0000 |
|---|---|---|
| committer | Jarkko Hietaniemi <jhi@iki.fi> | 2002-05-03 02:22:56 +0000 |
| commit | ee1db23eeaa208908244ed9e479fed560e28d90a (patch) | |
| tree | 23d5e02a0d6e4d8da97ff3d0d63ea3a6c6df74bb | |
| parent | a7fbee988c00db7c1d8bee64bbf744b02ff32f4c (diff) | |
| download | perl-ee1db23eeaa208908244ed9e479fed560e28d90a.tar.gz | |
Integrate macperl #16360 and #16363;
Make op/alarm.t pass
README.macos update
p4raw-id: //depot/perl@16364
p4raw-integrated: from //depot/macperl@16358 'copy in' README.macos
t/op/alarm.t (@16123..)
| -rw-r--r-- | README.macos | 14 | ||||
| -rw-r--r-- | t/op/alarm.t | 3 |
2 files changed, 9 insertions, 8 deletions
diff --git a/README.macos b/README.macos index dda602b0a8..5df494c710 100644 --- a/README.macos +++ b/README.macos @@ -19,9 +19,9 @@ Mac OS X. =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 @@ and binaries) and anonymous CVS. 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 PowerPC architectures. The MPW tool may be used on Mac OS 7.5.5 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 @@ Nandor E<lt>pudge@pobox.comE<gt>. =head1 DATE -Last modified 2002.02.28. +Last modified 2002.05.02. diff --git a/t/op/alarm.t b/t/op/alarm.t index c008737dff..384ee1d028 100644 --- a/t/op/alarm.t +++ b/t/op/alarm.t @@ -45,6 +45,7 @@ $diff = time - $start_time; 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)" ); } |