From: Peter Rabbitson Date: Wed, 14 Sep 2016 16:07:00 +0000 (+0200) Subject: (travis) Make sure everything works even when we are SAD X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=dbsrgits%2FDBIx-Class.git;a=commitdiff_plain;h=32871272c1fa5d098895fb3d6d2b2ed3640f371b (travis) Make sure everything works even when we are SAD http://www.martin-evans.me.uk/node/119 http://www.dagolden.com/index.php/1771/why-perl_unicode-makes-me-sad/ --- diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash index 8da037f..1a4968f 100644 --- a/maint/travis-ci_scripts/20_install.bash +++ b/maint/travis-ci_scripts/20_install.bash @@ -152,6 +152,9 @@ if [[ "$POISON_ENV" = "true" ]] ; then fi done + echo "POISON_ENV: setting PERL_UNICODE=SAD" + export PERL_UNICODE=SAD + ### emulate a local::lib-like env diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 2a55324..21df67f 100644 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -185,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" diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash index 83f1a89..fd30331 100644 --- a/maint/travis-ci_scripts/50_after_success.bash +++ b/maint/travis-ci_scripts/50_after_success.bash @@ -27,6 +27,11 @@ if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then parallel_installdeps_notest YAML Lexical::SealRequireHints fi + # FIXME - workaround for RT#117855/RT#117856 + if [[ -n "$PERL_UNICODE" ]] ; then + parallel_installdeps_notest Text::CSV + fi + # FIXME Change when Moose goes away installdeps Moose $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir) diff --git a/xt/extra/internals/optional_deps.t b/xt/extra/internals/optional_deps.t index c1aa96e..e933911 100644 --- a/xt/extra/internals/optional_deps.t +++ b/xt/extra/internals/optional_deps.t @@ -12,6 +12,11 @@ no warnings qw/once/; use Test::More; use Test::Exception; +BEGIN { + plan skip_all => 'This test breaking module loading interferes with PERL_UNICODE on perls prior to 5.12' + if exists $ENV{PERL_UNICODE} and "$]" < 5.012; +} + # load before we break require() use Scalar::Util(); use MRO::Compat();