From be708cc0141c68546a70e3d19f68ad41bef15add Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Wed, 26 Sep 2001 12:53:16 +0000 Subject: Integrate macperl changes from Chris Nandor: 12192 11817 11815 11813 11778 11775 Update CPAN.pm to work with new Mac::BuildTools instead of ExtUtils::MM_MacOS "orphan" functions Fix test Make syntax check report in MPW style, fix tests to use Mac::err=unix to get normal-style error messages. More module and test ports from Thomas Wegner et al Fix open of /dev/null for Mac OS Allow for platforms to override formatting of errors on output from Matthias Neeracher (core files) p4raw-id: //depot/perl@12235 p4raw-edited: from //depot/maint-5.6/macperl@12234 'edit in' lib/File/DosGlob.pm t/op/magic.t (@11007..) p4raw-integrated: from //depot/maint-5.6/macperl@12234 'copy in' lib/File/Spec/Mac.pm lib/File/Temp.pm (@11007..) 'merge in' ext/File/Glob/Glob.pm lib/CPAN.pm (@11007..) ext/File/Glob/bsd_glob.c t/base/term.t (@11185..) t/op/runlevel.t (@11198..) t/pod/testp2pt.pl (@11500..) p4raw-integrated: from //depot/maint-5.6/macperl@11815 'merge in' perl.c (@11806..) p4raw-integrated: from //depot/maint-5.6/macperl@11775 'merge in' perl.h pp_ctl.c util.c (@11007..) --- lib/strict.t | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/strict.t') diff --git a/lib/strict.t b/lib/strict.t index 6067ad39bf..3a0a2eca8f 100644 --- a/lib/strict.t +++ b/lib/strict.t @@ -69,11 +69,11 @@ for (@prgs){ print TEST $prog,"\n"; close TEST; my $results = $Is_MSWin32 ? - `.\\perl -I../lib $switch $tmpfile 2>&1` : - $^O eq 'MacOS' ? - `$^X -I::lib $switch $tmpfile` : + `.\\perl -I../lib $switch $tmpfile 2>&1` : $^O eq 'NetWare' ? - `perl -I../lib $switch $tmpfile 2>&1` : + `perl -I../lib $switch $tmpfile 2>&1` : + $^O eq 'MacOS' ? + `$^X -I::lib -MMac::err=unix $switch $tmpfile` : `./perl $switch $tmpfile 2>&1`; my $status = $?; $results =~ s/\n+$//; -- cgit v1.2.1