Use run_perl() from VPIT::TestHelpers

[perl/modules/indirect.git] / t / 50-external.t

diff --git a/t/50-external.t b/t/50-external.t
index e717bdfe6447e333eca31860d68746e6c3537dec..9e80f01678ffa7522bfa94b8752a7c1bf02f5331 100644 (file)
--- a/t/50-external.t
+++ b/t/50-external.t
@@ -3,21 +3,28 @@
 use strict;
 use warnings;
 
-use Test::More tests => 1;
+use Test::More tests => 3;
 
-BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
+use lib 't/lib';
+use VPIT::TestHelpers;
 
-sub run_perl {
- my $code = shift;
+BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
- my $SystemRoot   = $ENV{SystemRoot};
- local %ENV;
- $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
+{
+ my $status = run_perl 'no indirect; qq{a\x{100}b} =~ /\A[\x00-\x7f]*\z/;';
+ is $status, 0, 'RT #47866';
+}
 
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
+SKIP:
+{
+ skip 'Fixed in core only since 5.12' => 1 unless "$]" >= 5.012;
+ my $status = run_perl 'no indirect hook => sub { exit 2 }; new X';
+ is $status, 2 << 8, 'no semicolon at the end of -e';
 }
 
+SKIP:
 {
- my $status = run_perl 'no indirect; qq{a\x{100}b} =~ /\A[\x00-\x7f]*\z/;';
- is $status, 0, 'RT #47866';
+ load_or_skip('Devel::CallParser', undef, undef, 1);
+ my $status = run_perl "use Devel::CallParser (); no indirect; sub ok { } ok 1";
+ is $status, 0, 'indirect is not getting upset by Devel::CallParser';
 }