From: Peter Rabbitson <ribasushi@cpan.org>
Date: Tue, 3 Nov 2015 08:53:56 +0000 (+0100)
Subject: Fix test failure on 5.8.x with DBIC_TRACE=1 (introduced by 68b8ba54)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e93fb36285f265657d67a1ee7e8a5859aab2b27c;p=dbsrgits%2FDBIx-Class-Historic.git

Fix test failure on 5.8.x with DBIC_TRACE=1 (introduced by 68b8ba54)

The CI run did not smokje this particular combination
TLDR: like ... qr/.../m does not work on 5.8.x due to P5#3038
---

diff --git a/.travis.yml b/.travis.yml
index f008808..672d3ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,11 +91,12 @@ matrix:
         - BREWVER=5.8.3
         - BREWOPTS="-Dusemorebits"
 
-    # Full Test of minimum supported without threads with non-tracing poisoning
+    # Full Test of minimum supported without threads with plain poisoned trace
     - perl: 5.8.3_nt
       env:
         - CLEANTEST=false
         - POISON_ENV=true
+        - DBIC_TRACE=1
         - BREWVER=5.8.3
 
     # Full Test of minimum supported with threads with non-tracing poisoning
@@ -178,12 +179,13 @@ matrix:
         - BREWVER=5.8.1
         - BREWOPTS="-Duseithreads -Dusemorebits"
 
-    # oldest possible with blead CPAN with poisoning
+    # oldest possible with blead CPAN with poisoning and plain trace
     - perl: devcpan_5.8.1
       env:
         - CLEANTEST=true
         - DEVREL_DEPS=true
         - POISON_ENV=true
+        - DBIC_TRACE=1
         - BREWVER=5.8.1
 
     # 5.8.3 with blead CPAN
diff --git a/t/storage/debug.t b/t/storage/debug.t
index ccf7feb..6868795 100644
--- a/t/storage/debug.t
+++ b/t/storage/debug.t
@@ -71,11 +71,12 @@ my $exception = try {
   open(STDERR, '>&STDERRCOPY');
 };
 
-like $exception, qr/
+ok $exception =~ /
   \QDuplication of STDERR for debug output failed (perhaps your STDERR is closed?)\E
     .+
   \Qat @{[__FILE__]} line $exception_line_number\E$
-/xms;
+/xms
+  or diag "Unexpected exception text:\n\n$exception\n";
 
 my @warnings;
 $exception = try {