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/
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=689e22d1;p=dbsrgits%2FDBIx-Class.git

make 54taint.t actually test the DBIx::Class in lib/
---

diff --git a/t/54taint.t b/t/54taint.t
index 573e3c0..2a37ed5 100644
--- a/t/54taint.t
+++ b/t/54taint.t
@@ -17,9 +17,17 @@ 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(lib);
+use lib qw(t/lib);
+
 use Test::More;
 use Test::Exception;
-use lib qw(t/lib);
 use DBICTest;
 
 throws_ok (