X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=3428b871845aef01c565f6116baf65bc02e63b0f;hb=726501ac7b53da828fc360c2ddcd0bd3e12e56bb;hp=99e081539a1b02978bef5e034db47bccd1048e8b;hpb=eed5492fecb339252aaad11adb22651e5bd06d7b;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
index 99e0815..3428b87 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -9,14 +9,16 @@ if [[ "$POISON_ENV" = "true" ]] ; then
   for var in $(grep -P '\$ENV\{' -r lib/ | grep -oP 'DBIC_\w+' | sort -u | grep -v DBIC_TRACE) ; do
     export $var=1
   done
-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"
+  export DBI_DSN="dbi:ODBC:server=NonexistentServerAddress"
+  export DBI_DRIVER="ADO"
+
+  export DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER=1
+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
 
 
@@ -33,12 +35,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
@@ -49,9 +45,11 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # possible, mainly to catch "but X is perl core" mistakes
   # So instead we still use our stock (possibly old) CPAN, and add some
   # handholding
-  CPAN_is_sane || \
-    run_or_err "Pre-installing ExtUtils::MakeMaker and Module::Build" \
-      "cpan ExtUtils::MakeMaker Module::Build"
+  if ! CPAN_is_sane ; then
+    for m in ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build ; do
+      run_or_err "Pre-installing $m" "cpan $m"
+    done
+  fi
 
   if ! perl -MModule::Build -e 1 &> /dev/null ; then
     echo_err -e "Module::Build installation failed\n$LASTOUT"
@@ -85,8 +83,8 @@ else
   parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal
   parallel_installdeps_notest Test::Warn bareword::filehandles B::Hooks::EndOfScope Test::Differences HTTP::Status
   parallel_installdeps_notest Test::Pod::Coverage Test::EOL Devel::GlobalDestruction Sub::Name MRO::Compat Class::XSAccessor URI::Escape HTML::Entities
-  parallel_installdeps_notest YAML LWP Moo Class::Trigger JSON::XS DBI DateTime::Format::Builder
-  parallel_installdeps_notest Moose Class::Accessor::Grouped Module::Install JSON Package::Variant
+  parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
+  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator
 
   if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
     # the official version is full of 5.10-isms, but works perfectly fine on 5.8