Change 11815 by pudge@pudge-mobile on 2001/09/01 22:10:49
Make syntax check report in MPW style, fix tests
to use Mac::err=unix to get normal-style error
messages.
Affected files ...
... //depot/maint-5.6/macperl/perl.c#4 edit
... //depot/maint-5.6/macperl/t/lib/b.t#2 edit
... //depot/maint-5.6/macperl/t/op/misc.t#4 edit
... //depot/maint-5.6/macperl/t/op/runlevel.t#3 edit
... //depot/maint-5.6/macperl/t/pod/testp2pt.pl#4 edit
... //depot/maint-5.6/macperl/t/pragma/strict.t#3 edit
... //depot/maint-5.6/macperl/t/pragma/subs.t#3 edit
... //depot/maint-5.6/macperl/t/pragma/warnings.t#3 edit
Differences ...
==== //depot/maint-5.6/macperl/perl.c#4 (text) ====
Index: perl/perl.c
--- perl/perl.c.~1~ Sat Sep 1 16:15:07 2001
+++ perl/perl.c Sat Sep 1 16:15:07 2001
@@ -1446,7 +1446,7 @@
if (PL_minus_c) {
#ifdef MACOS_TRADITIONAL
- PerlIO_printf(Perl_error_log, "%s syntax OK\n",
MacPerl_MPWFileName(PL_origfilename));
+ PerlIO_printf(Perl_error_log, "# %s syntax OK\n",
+MacPerl_MPWFileName(PL_origfilename));
#else
PerlIO_printf(Perl_error_log, "%s syntax OK\n", PL_origfilename);
#endif
==== //depot/maint-5.6/macperl/t/lib/b.t#2 (xtext) ====
Index: perl/t/lib/b.t
--- perl/t/lib/b.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/lib/b.t Sat Sep 1 16:15:07 2001
@@ -63,10 +63,11 @@
my $Is_MacOS = $^O eq 'MacOS';
my $path = join " ", map { qq["-I$_"] } @INC;
+$path .= " -MMac::err=unix" if $Is_MacOS;
my $redir = $Is_MacOS ? "" : "2>&1";
$a = `$^X $path "-MO=Deparse" -anle 1 $redir`;
-$a =~ s/-e syntax OK\n//g;
+$a =~ s/(?:# )-e syntax OK\n//g; # "# " for Mac OS
$a =~ s{\\340\\242}{\\s} if (ord("\\") == 224); # EBCDIC, cp 1047 or 037
$a =~ s{\\274\\242}{\\s} if (ord("\\") == 188); # $^O eq 'posix-bc'
$b = <<'EOF';
==== //depot/maint-5.6/macperl/t/op/misc.t#4 (xtext) ====
Index: perl/t/op/misc.t
--- perl/t/op/misc.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/op/misc.t Sat Sep 1 16:15:07 2001
@@ -36,7 +36,7 @@
$results = `.\\perl -I../lib $switch $tmpfile 2>&1`;
}
elsif ($^O eq 'MacOS') {
- $results = `$^X -I::lib $switch $tmpfile`;
+ $results = `$^X -I::lib -MMac::err=unix $switch $tmpfile`;
}
else {
$results = `./perl $switch $tmpfile 2>&1`;
==== //depot/maint-5.6/macperl/t/op/runlevel.t#3 (xtext) ====
Index: perl/t/op/runlevel.t
--- perl/t/op/runlevel.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/op/runlevel.t Sat Sep 1 16:15:07 2001
@@ -37,7 +37,7 @@
$Is_MSWin32 ?
`.\\perl -I../lib $switch $tmpfile 2>&1` :
$Is_MacOS ?
- `$^X -I::lib $switch $tmpfile` :
+ `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
`./perl $switch $tmpfile 2>&1`;
my $status = $?;
$results =~ s/\n+$//;
==== //depot/maint-5.6/macperl/t/pod/testp2pt.pl#4 (text) ====
Index: perl/t/pod/testp2pt.pl
--- perl/t/pod/testp2pt.pl.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/pod/testp2pt.pl Sat Sep 1 16:15:07 2001
@@ -48,7 +48,7 @@
$INSTDIR =~ s#/000000/#/#;
}
-$INSTDIR =~ s{t[/\\:]pod$}{}i; # cut 't/pod' from path (cut 't:pod:' on Mac OS)
+$INSTDIR =~ s{t[/\\:]pod:?$}{}i; # cut 't/pod' from path (cut 't:pod:' on Mac OS)
my @PODINCDIRS = ( catfile($INSTDIR, 'lib', 'Pod'),
catfile($INSTDIR, 'scripts'),
==== //depot/maint-5.6/macperl/t/pragma/strict.t#3 (xtext) ====
Index: perl/t/pragma/strict.t
--- perl/t/pragma/strict.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/pragma/strict.t Sat Sep 1 16:15:07 2001
@@ -70,7 +70,7 @@
my $results = $Is_MSWin32 ?
`.\\perl -I../lib $switch $tmpfile 2>&1` :
$^O eq 'MacOS' ?
- `$^X -I::lib $switch $tmpfile` :
+ `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
`./perl $switch $tmpfile 2>&1`;
my $status = $?;
$results =~ s/\n+$//;
==== //depot/maint-5.6/macperl/t/pragma/subs.t#3 (xtext) ====
Index: perl/t/pragma/subs.t
--- perl/t/pragma/subs.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/pragma/subs.t Sat Sep 1 16:15:07 2001
@@ -51,7 +51,7 @@
$Is_MSWin32 ?
`.\\perl -I../lib $switch $tmpfile 2>&1` :
$Is_MacOS ?
- `$^X -I::lib $switch $tmpfile` :
+ `$^X -I::lib -MMac::err=unix $switch $tmpfile` :
`./perl $switch $tmpfile 2>&1`;
my $status = $?;
$results =~ s/\n+$//;
==== //depot/maint-5.6/macperl/t/pragma/warnings.t#3 (xtext) ====
Index: perl/t/pragma/warnings.t
--- perl/t/pragma/warnings.t.~1~ Sat Sep 1 16:15:07 2001
+++ perl/t/pragma/warnings.t Sat Sep 1 16:15:07 2001
@@ -95,7 +95,7 @@
$Is_MSWin32 ?
`.\\perl -I../lib $switch $tmpfile 2>&1` :
$Is_MacOS ?
- `$^X -I::lib $switch $tmpfile` :
+ `$^X -I::lib $switch -MMac::err=unix $tmpfile` :
`./perl -I../lib $switch $tmpfile 2>&1`;
my $status = $?;
$results =~ s/\n+$//;
End of Patch.
