X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=21df67fc47207bc031a392f12b89a89e34287024;hb=86be9bcb90213db633791fcce074b7268765f615;hp=10932d3a95a0c31e490524d9e6f34381d33a3887;hpb=ee3a37d38c54973f7e4b65273d776bbad54f6101;p=dbsrgits%2FDBIx-Class.git

diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash
old mode 100755
new mode 100644
index 10932d3..21df67f
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -24,13 +24,8 @@ if is_cperl ; then
   export PERL5LIB="$PERL5LIB:."
 
   # Also need to have YAML in place, otherwise the distroprefs are not readable
-  # (cperl 5.22.2 comes with YAML already)
-  perl -M5.022002 -e1 &>/dev/null || installdeps YAML
-
-  # Work around cperl's Test::More being typed, by getting the CPAN one
-  # https://github.com/perl11/cperl/issues/153#issuecomment-224515895
-  # ( in the long term this is sadly a nail in cperl's coffin :/ )
-  installdeps Test::More
+  # work around https://github.com/perl11/cperl/issues/155#issuecomment-224862978
+  perl -MYAML -e1 &>/dev/null || installdeps YAML
 
 fi
 
@@ -190,6 +185,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
 ##### END TEMPORARY WORKAROUNDS
   fi
 
+  # FIXME - work around RT#117844
+  if [[ "$BREWVER" == "5.10.0" ]]; then
+    unset PERL_UNICODE
+  fi
+
   installdeps $HARD_DEPS
 
   run_or_err "Re-configure" "perl Makefile.PL"