From: Zefram <zefram@fysh.org>
Date: Wed, 18 Nov 2009 22:03:44 +0000 (+0000)
Subject: minitest fixes
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=8a71e97e936696283eb1a280cffaa37177ef24f1;p=p5sagit%2Fp5-mst-13.2.git

minitest fixes

Attached patch fixes two small bugs that interfere with minitest.

-zefram

Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
---

diff --git a/Makefile.SH b/Makefile.SH
index 832e643..636d18f 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1416,7 +1416,7 @@ test.taintwarn:	test_prep
 	TEST_ARGS=-taintwarn $(RUN_TESTS) choose
 
 minitest.prep:
-	-@test test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
+	-@test -f lib/Config.pm || $(MAKE) lib/Config.pm $(unidatafiles)
 	@echo " "
 	@echo "You may see some irrelevant test failures if you have been unable"
 	@echo "to build lib/Config.pm, or the Unicode data files."
diff --git a/t/io/perlio.t b/t/io/perlio.t
index cdc4c72..0bb23fa 100644
--- a/t/io/perlio.t
+++ b/t/io/perlio.t
@@ -108,7 +108,7 @@ ok(close($utffh));
 SKIP: {
     eval { require PerlIO::scalar };
     unless (find PerlIO::Layer 'scalar') {
-	skip("PerlIO::scalar not found", 8);
+	skip("PerlIO::scalar not found", 9);
     }
     my $var;
     ok( open(my $x,"+<",\$var), 'magic in-memory file via 3 arg open with \\$var');
@@ -142,7 +142,6 @@ SKIP: {
         ok( open(STDERR,">",\$var), '       open STDERR into in-memory var');
         open STDERR,  ">&OLDERR" or die "cannot dup OLDERR: $!";
     }
-}
 
 
 { local $TODO = 'fails well back into 5.8.x';
@@ -168,6 +167,8 @@ close ($perlio);
 close ($no_perlio);
 }
 
+}
+
 
 END {
     1 while unlink $txt;