-my $total;
-BEGIN {
- $total = 8;
-}
-
-use Test::More tests => $total + 1;
-
-use IPC::Cmd qw/run/;
-
-(my $success, my $err_code, undef, undef, my $stderr)
- = run command => [
- $^X,
- map('-I' . $_, @INC),
- '-c',
- 't/data/mixed.d'
- ];
-$stderr = join '', @$stderr;
-unless ($success) {
- diag $stderr;
- diag "Failed to execute data file (error $err_code)";
- fail "Couldn't run test $_" for 1 .. $total + 1;
-}
-
-my %fail = map { $_ => 1 } 2, 3, 5, 7;
-my %failed;
-my $extra_fail = 0;
-
-while ($stderr =~ /^Indirect\s+call\s+of\s+method\s+"([^"]+)"\s+on\s+object\s+"([^"]+)"/mg) {
- my ($m, $o) = ($1, $2);
- my $id;
- if ($o =~ /^P(\d+)$/) {
- $id = $1;
- } else {
- diag "$m $o";
- ++$extra_fail;
+my $tests;
+BEGIN { $tests = 18 }
+
+use Test::More tests => 1 + $tests + 1 + 2;
+
+my %wrong = map { $_ => 1 } 2, 3, 5, 7, 9, 10, 14, 15, 17, 18;
+
+sub expect {
+ my ($pkg) = @_;
+ return qr/^warn:Indirect\s+call\s+of\s+method\s+"new"\s+on\s+object\s+"$pkg"\s+at\s+\(eval\s+\d+\)\s+line\s+\d+/;
+}
+
+{
+ my $code = do { local $/; <DATA> };
+ my (%res, $num, @left);
+ {
+ local $SIG{__WARN__} = sub {
+ ++$num;
+ my $w = join '', 'warn:', @_;
+ if ($w =~ /"P(\d+)"/ and not exists $res{$1}) {
+ $res{$1} = $w;
+ } else {
+ push @left, "[$num] $w";
+ }
+ };
+ eval "die qq{ok\\n}; $code";
+ is($@, "ok\n", 'DATA compiled fine');
+ }
+ for (1 .. $tests) {
+ my $w = $res{$_};
+ if ($wrong{$_}) {
+ like($w, expect("P$_"), "$_ should warn");
+ } else {
+ is($w, undef, "$_ shouldn't warn");
+ }