Don't segfault for indirect constructs inside the empty package

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

diff --git a/t/50-external.t b/t/50-external.t
index 5d3d37564b0e20987e51a429e9ab1d985c495c68..2476cd68421f883b2a2e7fb4909a91af6e988068 100644 (file)
--- a/t/50-external.t
+++ b/t/50-external.t
@@ -3,20 +3,12 @@
 use strict;
 use warnings;
 
-use Test::More tests => 2;
+use Test::More tests => 4;
 
-BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
-
-sub run_perl {
- my $code = shift;
+use lib 't/lib';
+use VPIT::TestHelpers;
 
- my ($SystemRoot, $PATH) = @ENV{qw<SystemRoot PATH>};
- local %ENV;
- $ENV{SystemRoot} = $SystemRoot if $^O eq 'MSWin32' and defined $SystemRoot;
- $ENV{PATH}       = $PATH       if $^O eq 'cygwin'  and defined $PATH;
-
- system { $^X } $^X, '-T', map("-I$_", @INC), '-e', $code;
-}
+BEGIN { delete $ENV{PERL_INDIRECT_PM_DISABLE} }
 
 {
  my $status = run_perl 'no indirect; qq{a\x{100}b} =~ /\A[\x00-\x7f]*\z/;';
@@ -29,3 +21,22 @@ SKIP:
  my $status = run_perl 'no indirect hook => sub { exit 2 }; new X';
  is $status, 2 << 8, 'no semicolon at the end of -e';
 }
+
+SKIP:
+{
+ 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';
+}
+
+SKIP:
+{
+ my $has_package_empty = do {
+  local $@;
+  eval 'no warnings "deprecated"; package; 1'
+ };
+ skip 'Empty package only available on perl 5.8.x and below' => 1
+                                                      unless $has_package_empty;
+ my $status = run_perl 'no indirect hook => sub { }; exit 0; package; new X;';
+ is $status, 0, 'indirect does not croak while package empty is in use';
+}