diff options
| author | Zefram <zefram@fysh.org> | 2009-11-18 22:03:44 +0000 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2009-11-19 08:32:52 +0100 |
| commit | 8a71e97e936696283eb1a280cffaa37177ef24f1 (patch) | |
| tree | d730f74b66b404f52389106e2f944a57d0f13207 | |
| parent | 960e02cf6495127c5c8a67618a9e6bd7408d7025 (diff) | |
| download | perl-8a71e97e936696283eb1a280cffaa37177ef24f1.tar.gz | |
minitest fixes
Attached patch fixes two small bugs that interfere with minitest.
-zefram
Signed-off-by: H.Merijn Brand <h.m.brand@xs4all.nl>
| -rw-r--r-- | Makefile.SH | 2 | ||||
| -rw-r--r-- | t/io/perlio.t | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.SH b/Makefile.SH index 832e643af7..636d18f2cd 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 cdc4c72775..0bb23fa9e0 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; |