diff options
author | Nicholas Clark <nick@ccl4.org> | 2021-09-14 08:02:05 +0000 |
---|---|---|
committer | Nicholas Clark <nick@ccl4.org> | 2021-09-16 13:22:06 +0000 |
commit | 66e1ef42e57482043a617e825835d1ded9ac5d3e (patch) | |
tree | ec9257f10ac39250de4ab3bb4fd2e88befd6d63e /ext | |
parent | e72852772d35fa07c6f4def68643512939de4443 (diff) | |
download | perl-66e1ef42e57482043a617e825835d1ded9ac5d3e.tar.gz |
Remove all "configured without perlio" test SKIPs from ext/B
It's not been possible to build perl without perlio since v5.16.0
Also remove comments relating to code fixups that were removed in Oct 2006
by commit ab7e0f544dbf50e3:
[patch] simplify optree test support
Message-ID: <4545220A.6060500@gmail.com>
Remove redundant `use Config;`s, and correct one (intended) %Config::Config
lookup where Config was only required, and hence %Config was not imported.
Diffstat (limited to 'ext')
-rw-r--r-- | ext/B/t/concise-xs.t | 4 | ||||
-rw-r--r-- | ext/B/t/concise.t | 13 | ||||
-rw-r--r-- | ext/B/t/f_map.t | 12 | ||||
-rw-r--r-- | ext/B/t/f_sort.t | 12 | ||||
-rw-r--r-- | ext/B/t/o.t | 11 | ||||
-rw-r--r-- | ext/B/t/optree_check.t | 4 | ||||
-rw-r--r-- | ext/B/t/optree_concise.t | 5 | ||||
-rw-r--r-- | ext/B/t/optree_constants.t | 5 | ||||
-rw-r--r-- | ext/B/t/optree_misc.t | 6 | ||||
-rw-r--r-- | ext/B/t/optree_samples.t | 5 | ||||
-rw-r--r-- | ext/B/t/optree_sort.t | 5 | ||||
-rw-r--r-- | ext/B/t/optree_specials.t | 1 | ||||
-rw-r--r-- | ext/B/t/optree_varinit.t | 5 | ||||
-rw-r--r-- | ext/B/t/showlex.t | 6 |
14 files changed, 6 insertions, 88 deletions
diff --git a/ext/B/t/concise-xs.t b/ext/B/t/concise-xs.t index 217a44e9f4..2bf3895f9e 100644 --- a/ext/B/t/concise-xs.t +++ b/ext/B/t/concise-xs.t @@ -10,10 +10,6 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - unless ($Config::Config{useperlio}) { - print "1..0 # Skip -- Perl configured without perlio\n"; - exit 0; - } } use Carp; diff --git a/ext/B/t/concise.t b/ext/B/t/concise.t index 870429f4fc..41ac70aaab 100644 --- a/ext/B/t/concise.t +++ b/ext/B/t/concise.t @@ -42,7 +42,6 @@ like($out, qr/print/, "'-exec' option output has print opcode"); ######## API tests v.60 -use Config; # used for perlio check B::Concise->import(qw( set_style set_style_standard add_callback add_style walk_output reset_sequence )); @@ -70,10 +69,7 @@ eval { walk_output($foo) }; is ($@, '', "walk_output() accepts obj that can print"); # test that walk_output accepts a HANDLE arg -SKIP: { - skip("no perlio in this build", 4) - unless $Config::Config{useperlio}; - +{ foreach my $foo (\*STDOUT, \*STDERR) { eval { walk_output($foo) }; is ($@, '', "walk_output() accepts STD* " . ref $foo); @@ -129,11 +125,8 @@ sub render { return $out; } -SKIP: { +{ # tests output to GLOB, using perlio feature directly - skip "no perlio on this build", 127 - unless $Config::Config{useperlio}; - set_style_standard('concise'); # MUST CALL before output needed @options = qw( @@ -413,7 +406,7 @@ $out = runperl ( switches => ["-MO=Concise,-stash=Data::Dumper,-src,-exec"], SKIP: { skip "Data::Dumper is statically linked", 1 - if $Config{static_ext} =~ m|\bData/Dumper\b|; + if $Config::Config{static_ext} =~ m|\bData/Dumper\b|; like($out, qr/FUNC: \*Data::Dumper::format_refaddr/, "stash rendering loads package as needed"); } diff --git a/ext/B/t/f_map.t b/ext/B/t/f_map.t index 221f2926e2..d561cb7984 100644 --- a/ext/B/t/f_map.t +++ b/ext/B/t/f_map.t @@ -7,10 +7,6 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; plan tests => 18; @@ -20,14 +16,6 @@ plan tests => 18; Code test snippets here are adapted from `perldoc -f map` -Due to a bleadperl optimization (Dave Mitchell, circa may 04), the -(map|grep)(start|while) opcodes have different flags in 5.9, their -private flags /1, /2 are gone in blead (for the cases covered) - -When the optree stuff was integrated into 5.8.6, these tests failed, -and were todo'd. They're now done, by version-specific tweaking in -mkCheckRex(), therefore the skip is removed too. - =for gentest # chunk: #!perl diff --git a/ext/B/t/f_sort.t b/ext/B/t/f_sort.t index b78eec2beb..278e4cc094 100644 --- a/ext/B/t/f_sort.t +++ b/ext/B/t/f_sort.t @@ -7,10 +7,6 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; plan tests => 38; @@ -19,14 +15,6 @@ plan tests => 38; Code test snippets here are adapted from `perldoc -f map` -Due to a bleadperl optimization (Dave Mitchell, circa apr 04), the -(map|grep)(start|while) opcodes have different flags in 5.9, their -private flags /1, /2 are gone in blead (for the cases covered) - -When the optree stuff was integrated into 5.8.6, these tests failed, -and were todo'd. They're now done, by version-specific tweaking in -mkCheckRex(), therefore the skip is removed too. - =head1 Test Notes # chunk: #!perl diff --git a/ext/B/t/o.t b/ext/B/t/o.t index 75d8ee8526..b11aa4ac7e 100644 --- a/ext/B/t/o.t +++ b/ext/B/t/o.t @@ -11,7 +11,6 @@ BEGIN { } use strict; -use Config; use File::Spec; use File::Path; @@ -41,14 +40,10 @@ is( $lines[3], '-e syntax OK', 'O.pm should not munge perl output without -qq'); @lines = get_lines( '-MO=-q,success,foo,bar' ); isnt( $lines[1], 'Compiling!', 'Output should not be printed with -q switch' ); -SKIP: { - skip( '-q redirection does not work without PerlIO', 2) - unless $Config{useperlio}; - is( $lines[1], "[Compiling!", '... but should be in $O::BEGIN_output' ); +is( $lines[1], "[Compiling!", '... but should be in $O::BEGIN_output' ); - @lines = get_lines( '-MO=-qq,success,foo,bar' ); - is( scalar @lines, 3, '-qq should suppress even the syntax OK message' ); -} +@lines = get_lines( '-MO=-qq,success,foo,bar' ); +is( scalar @lines, 3, '-qq should suppress even the syntax OK message' ); @lines = get_lines( '-MO=success,fail' ); like( $lines[1], qr/fail at .eval/, diff --git a/ext/B/t/optree_check.t b/ext/B/t/optree_check.t index 9daf5221b7..1b87839f01 100644 --- a/ext/B/t/optree_check.t +++ b/ext/B/t/optree_check.t @@ -7,10 +7,6 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; diff --git a/ext/B/t/optree_concise.t b/ext/B/t/optree_concise.t index 86280ac488..cf93bd1056 100644 --- a/ext/B/t/optree_concise.t +++ b/ext/B/t/optree_concise.t @@ -7,15 +7,10 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } # import checkOptree(), and %gOpts (containing test state) use OptreeCheck; # ALSO DOES @ARGV HANDLING !!!!!! -use Config; plan tests => 41; diff --git a/ext/B/t/optree_constants.t b/ext/B/t/optree_constants.t index 43afacc570..d5e48a715e 100644 --- a/ext/B/t/optree_constants.t +++ b/ext/B/t/optree_constants.t @@ -7,14 +7,9 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; # ALSO DOES @ARGV HANDLING !!!!!! -use Config; plan tests => 99; diff --git a/ext/B/t/optree_misc.t b/ext/B/t/optree_misc.t index 490abb33d4..44c4b564cd 100644 --- a/ext/B/t/optree_misc.t +++ b/ext/B/t/optree_misc.t @@ -9,12 +9,8 @@ BEGIN { } } use OptreeCheck; -use Config; plan tests => 18; -SKIP: { -skip "no perlio in this build", 4 unless $Config::Config{useperlio}; - # The regression this was testing is that the first aelemfast, derived # from a lexical array, is supposed to be a BASEOP "<0>", while the # second, from a global, is an SVOP "<$>" or a PADOP "<#>" depending @@ -85,8 +81,6 @@ EOT_EOT # 3 <$> gvsv(*1) s ->4 EONT_EONT -} #skip - my $t = <<'EOT_EOT'; # 8 <@> leave[1 ref] vKP/REFC ->(end) # 1 <0> enter v ->2 diff --git a/ext/B/t/optree_samples.t b/ext/B/t/optree_samples.t index 0a498a9e52..5e489d698d 100644 --- a/ext/B/t/optree_samples.t +++ b/ext/B/t/optree_samples.t @@ -7,13 +7,8 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; -use Config; plan tests => 46; pass("GENERAL OPTREE EXAMPLES"); diff --git a/ext/B/t/optree_sort.t b/ext/B/t/optree_sort.t index 2c661f6765..f2a8f5c2ca 100644 --- a/ext/B/t/optree_sort.t +++ b/ext/B/t/optree_sort.t @@ -7,13 +7,8 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; -use Config; plan tests => 21; pass("SORT OPTIMIZATION"); diff --git a/ext/B/t/optree_specials.t b/ext/B/t/optree_specials.t index 07b2aa1111..a6dc206a4b 100644 --- a/ext/B/t/optree_specials.t +++ b/ext/B/t/optree_specials.t @@ -24,7 +24,6 @@ BEGIN { # import checkOptree(), and %gOpts (containing test state) use OptreeCheck; # ALSO DOES @ARGV HANDLING !!!!!! -use Config; plan tests => 15; diff --git a/ext/B/t/optree_varinit.t b/ext/B/t/optree_varinit.t index 8312df029d..d89afc24f3 100644 --- a/ext/B/t/optree_varinit.t +++ b/ext/B/t/optree_varinit.t @@ -7,13 +7,8 @@ BEGIN { print "1..0 # Skip -- Perl configured without B module\n"; exit 0; } - if (!$Config::Config{useperlio}) { - print "1..0 # Skip -- need perlio to walk the optree\n"; - exit 0; - } } use OptreeCheck; -use Config; plan tests => 42; pass("OPTIMIZER TESTS - VAR INITIALIZATION"); diff --git a/ext/B/t/showlex.t b/ext/B/t/showlex.t index dbbf3d27ea..9d835dd3b3 100644 --- a/ext/B/t/showlex.t +++ b/ext/B/t/showlex.t @@ -13,7 +13,6 @@ BEGIN { $| = 1; use warnings; use strict; -use Config; use B::Showlex (); plan tests => 15; @@ -49,10 +48,6 @@ for $newlex ('', '-newlex') { print $out if $verbose; -SKIP: { - skip "no perlio in this build", 5 - unless $Config::Config{useperlio}; - our $buf = 'arb startval'; my $ak = B::Showlex::walk_output (\$buf); @@ -102,4 +97,3 @@ SKIP: { $walker->(); } -} |