From: Vincent Pit <vince@profvince.com>
Date: Sun, 24 Jun 2012 22:51:11 +0000 (+0200)
Subject: Improve Capture::Tiny discovery in t/17-ctl.t
X-Git-Tag: v0.50~1
X-Git-Url: http://git.vpit.fr/?a=commitdiff_plain;h=bf312200eadacf72b88d138784777e8a9c7be40c;p=perl%2Fmodules%2FVariable-Magic.git

Improve Capture::Tiny discovery in t/17-ctl.t
---

diff --git a/t/17-ctl.t b/t/17-ctl.t
index 2adf60d..2500a94 100644
--- a/t/17-ctl.t
+++ b/t/17-ctl.t
@@ -226,13 +226,19 @@ sub run_perl {
 
 my $has_capture_tiny = do {
  local $@;
- eval 'use Capture::Tiny 0.08 (); 1'
+ eval {
+  require Capture::Tiny;
+  Capture::Tiny->VERSION('0.08');
+ }
 };
 if ($has_capture_tiny) {
- my $output = Capture::Tiny::capture_merged(sub { run_perl <<' CODE' });
+ local $@;
+ my $output = eval {
+  Capture::Tiny::capture_merged(sub { run_perl <<'  CODE' });
 print STDOUT "pants\n";
 print STDERR "trousers\n";
- CODE
+  CODE
+ };
  unless (defined $output and $output =~ /pants/ and $output =~ /trousers/) {
   $has_capture_tiny = 0;
  }