From: Matt S Trout <mst@shadowcat.co.uk>
Date: Thu, 28 Nov 2013 20:24:40 +0000 (+0000)
Subject: Make 54taint.t actually test the DBIx::Class in lib (originally 689e22d1)
X-Git-Tag: v0.08260~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6fc6d60cccc52f02eab2f6c7003a0f27dfc4459c;p=dbsrgits%2FDBIx-Class.git

Make 54taint.t actually test the DBIx::Class in lib (originally 689e22d1)
---

diff --git a/Changes b/Changes
index 04d2994..ad1b688 100644
--- a/Changes
+++ b/Changes
@@ -42,6 +42,8 @@ Revision history for DBIx::Class
         - Fix t/storage/replicated.t class loading problem
         - Stop using the deprecated Class::MOP::load_class()
         - Fix warning in t/54taint.t with explicitly unset PERL5LIB (RT#91972)
+        - Fix t/54taint.t failing under a local::lib with installed earlier
+          DBIC version (RT#92486)
 
     * Misc
         - Massive incompatible change of ::BlockRunner internals (was never
diff --git a/t/54taint.t b/t/54taint.t
index 5db9193..65b5315 100644
--- a/t/54taint.t
+++ b/t/54taint.t
@@ -17,9 +17,16 @@ BEGIN {
   }
 }
 
+# We need to specify 'lib' here as well because even if it was already in
+# @INC, the above will have put our local::lib in front of it, so now an
+# installed DBIx::Class will take precedence over the one we're trying to test.
+# In some cases, prove will have supplied ./lib as an absolute path so it
+# doesn't seem worth trying to remove the second copy since it won't hurt
+# anything.
+use lib qw(t/lib lib);
+
 use Test::More;
 use Test::Exception;
-use lib qw(t/lib);
 use DBICTest;
 
 throws_ok (