From: Ilya Zakharevich <ilya@math.berkeley.edu>
Date: Sun, 24 Jun 2001 05:47:05 +0000 (-0400)
Subject: Re: [PATCH 5.6.1] test suite
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4f0c37ba8a5ec95c6a79b1e0deea87d200d9357a;p=p5sagit%2Fp5-mst-13.2.git

Re: [PATCH 5.6.1] test suite
Message-ID: <20010624054705.A27890@math.ohio-state.edu>

Test suite fixes.

p4raw-id: //depot/perl@10883
---

diff --git a/ext/POSIX/sigaction.t b/ext/POSIX/sigaction.t
index c38b122..9731125 100644
--- a/ext/POSIX/sigaction.t
+++ b/ext/POSIX/sigaction.t
@@ -118,10 +118,12 @@ eval {
 print $@ ? "ok 17\n" : "not ok 17\n";
 
 $newaction=POSIX::SigAction->new(sub { $ok10=1; });
-sigaction(SIGCONT, POSIX::SigAction->new('DEFAULT'));
-{
+if (eval { SIGCONT; 1 }) {
+    sigaction(SIGCONT, POSIX::SigAction->new('DEFAULT'));
+    {
 	local($^W)=0;
 	kill 'CONT', $$;
+    }
 }
 print $bad18 ? "not ok 18\n" : "ok 18\n";
 
diff --git a/lib/File/stat.t b/lib/File/stat.t
index ac6d95f..999d2b2 100644
--- a/lib/File/stat.t
+++ b/lib/File/stat.t
@@ -31,7 +31,9 @@ my $stat = stat "TEST"; # This is the OO stat.
 print "not " unless $stat->dev     == $stat[ 0];
 print "ok 2\n";
 
-print "not " unless $stat->ino     == $stat[ 1];
+# On OS/2 (fake) ino is not constant, it is incremented each time
+print "# ino=>@{[$stat->ino]}, 1=>$stat[ 1]\nnot "
+	     unless $stat->ino     == $stat[ 1] or $^O eq 'os2';
 print "ok 3\n";
 
 print "not " unless $stat->mode    == $stat[ 2];
diff --git a/perl.c b/perl.c
index ae2091f..34da642 100644
--- a/perl.c
+++ b/perl.c
@@ -3141,7 +3141,8 @@ S_find_beginning(pTHX)
 	if ((s = sv_gets(PL_linestr, PL_rsfp, 0)) == Nullch)
 	    Perl_croak(aTHX_ "No Perl script found in input\n");
 #endif
-	if (*s == '#' && s[1] == '!' && (s = instr(s,"perl"))) {
+	s2 = s;
+	if (*s == '#' && s[1] == '!' && ((s = instr(s,"perl")) || (s = instr(s2,"PERL")))) {
 	    PerlIO_ungetc(PL_rsfp, '\n');		/* to keep line count right */
 	    PL_doextract = FALSE;
 	    while (*s && !(isSPACE (*s) || *s == '#')) s++;
diff --git a/t/io/utf8.t b/t/io/utf8.t
index a541030..224dfd7 100755
--- a/t/io/utf8.t
+++ b/t/io/utf8.t
@@ -177,5 +177,6 @@ $x = <F>; chomp $x;
 eval { sprintf "%vd\n", $x; }
 }
 
+close F;
 unlink('a');