From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 14 Aug 2015 04:41:57 +0000 (+0200)
Subject: Not sure what I was thinking, but 18637ebb never worked :/
X-Git-Tag: v0.082821~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b567407446fe2ac215dde043b1cef8e8e5f8d7b6;hp=acc13b63b7cab1169b71137d28d006536ad25ad0;p=dbsrgits%2FDBIx-Class.git

Not sure what I was thinking, but 18637ebb never worked :/

While at it work around the newly-discovered RT#106935
---

diff --git a/lib/DBIx/Class/ResultSet/Pager.pm b/lib/DBIx/Class/ResultSet/Pager.pm
index e8510c3..e606f8a 100644
--- a/lib/DBIx/Class/ResultSet/Pager.pm
+++ b/lib/DBIx/Class/ResultSet/Pager.pm
@@ -4,6 +4,9 @@ package # hide from pause
 use warnings;
 use strict;
 
+# temporary, to load MRO::Compat, will be soon entirely rewritten anyway
+use DBIx::Class::_Util;
+
 use base 'Data::Page';
 use mro 'c3';
 
diff --git a/xt/strictures.t b/xt/strictures.t
index adfd9a7..dcdd171 100644
--- a/xt/strictures.t
+++ b/xt/strictures.t
@@ -2,6 +2,9 @@ use warnings;
 use strict;
 
 use Test::More;
+use File::Find;
+use File::Spec;
+use Config;
 use lib 't/lib';
 use DBICTest;
 
@@ -18,12 +21,24 @@ use File::Find;
 # that are related to lib/ - then we should be able to run
 # perl -c checks (via syntax_ok), and all should just work
 my $missing_groupdeps_present = grep
-  { DBIx::Class::Optional::Dependencies->req_ok_for($_) }
+  { ! DBIx::Class::Optional::Dependencies->req_ok_for($_) }
   grep
     { $_ !~ /^ (?: test | rdbms | dist ) _ /x }
     keys %{DBIx::Class::Optional::Dependencies->req_group_list}
 ;
 
+# don't test syntax when RT#106935 is triggered (mainly CI)
+# FIXME - remove when RT is resolved
+my $tainted_relpath = (
+  length $ENV{PATH}
+    and
+  ${^TAINT}
+    and
+  grep
+    { ! File::Spec->file_name_is_absolute($_) }
+    split /\Q$Config{path_sep}/, $ENV{PATH}
+) ? 1 : 0;
+
 find({
   wanted => sub {
     -f $_ or return;
@@ -40,8 +55,13 @@ find({
     Test::Strict::strict_ok($f);
     Test::Strict::warnings_ok($f);
 
-    Test::Strict::syntax_ok($f)
-      if ! $missing_groupdeps_present and $f =~ /^ (?: lib  )/x;
+    Test::Strict::syntax_ok($f) if (
+      ! $tainted_relpath
+        and
+      ! $missing_groupdeps_present
+        and
+      $f =~ /^ (?: lib  )/x
+    );
   },
   no_chdir => 1,
 }, (qw(lib t examples maint)) );