i3test.pm: bail_out if injection of exported modules fails

diff --git a/testcases/lib/i3test.pm b/testcases/lib/i3test.pm
index 540e89bc1df07502450ba1da1df53b257d51e3a5..d1e0ed7d568d8380e833d68bb7a3a9b352a85f36 100644 (file)
--- a/testcases/lib/i3test.pm
+++ b/testcases/lib/i3test.pm
@@ -56,8 +56,12 @@ BEGIN {
 sub import {
     my $class = shift;
     my $pkg = caller;
-    eval "package $pkg;
-use Test::Most" . (@_ > 0 ? " qw(@_)" : "") . ";
+
+    my $test_most_args = @_ ? "qw(@_)" : "";
+    local $@;
+    eval << "__";
+package $pkg;
+use Test::Most $test_most_args;
 use Data::Dumper;
 use AnyEvent::I3;
 use Time::HiRes qw(sleep);
@@ -65,7 +69,9 @@ use Test::Deep qw(eq_deeply cmp_deeply cmp_set cmp_bag cmp_methods useclass nocl
 use v5.10;
 use strict;
 use warnings;
-";
+__
+    $tester->bail_out("$@") if $@;
+
     @_ = ($class);
     goto \&Exporter::import;
 }