From: Peter Rabbitson Date: Sun, 21 Apr 2013 06:57:37 +0000 (+0200) Subject: Make some travis confs smoke latest -dev offerings from CPAN X-Git-Tag: v0.08250~15 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=925a38ce0305bc1fbba13b0501bd8a3ea0cdb368;p=dbsrgits%2FDBIx-Class.git Make some travis confs smoke latest -dev offerings from CPAN Based on the Test::Builder dev-testing introduced in 992a24f6 --- diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 69d74be..0f3030e 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -11,14 +11,11 @@ if [[ "$POISON_ENV" = "true" ]] ; then done export DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER=1 -fi - -# try Schwern's latest offering on a stock perl and a threaded blead -# can't do this with CLEANTEST=true yet because a lot of our deps fail -# tests left and right under T::B 1.5 -if [[ "$CLEANTEST" != "true" ]] && ( [[ -z "$BREWVER" ]] || [[ "$BREWVER" = "blead" ]] ) ; then - # FIXME - there got to be a way to ask metacpan for this dynamically - TEST_BUILDER_BETA_CPAN_TARBALL="M/MS/MSCHWERN/Test-Simple-1.005000_005.tar.gz" +elif [[ "$CLEANTEST" != "true" ]] && ( [[ -z "$BREWVER" ]] || [[ "$BREWVER" = "blead" ]] ) ; then + # try CPAN's latest offering on a stock perl and a threaded blead + # can't do this with CLEANTEST=true yet because a lot of our deps fail + # tests left and right under T::B 1.5 + PERL_CPANM_OPT="$PERL_CPANM_OPT --dev" fi @@ -35,12 +32,6 @@ if [[ "$CLEANTEST" = "true" ]]; then mv ~/.cpanm/latest-build/DBIx-Class-*/inc . - # this should be installable anywhere, regardles of prereqs - if [[ -n "$TEST_BUILDER_BETA_CPAN_TARBALL" ]] ; then - run_or_err "Pre-installing dev-beta of Test::Builder ($TEST_BUILDER_BETA_CPAN_TARBALL)" \ - "cpan $TEST_BUILDER_BETA_CPAN_TARBALL" - fi - # older perls do not have a CPAN which understands configure_requires # properly and what is worse a `cpan Foo` run exits with 0 even if some # modules failed to install