X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=8fd295e91e1147bb21c73ec3d7b9da795439425f;hb=9ac3347b9d86da4e8d2490d72ec4da05ee346bb4;hp=47a1927ab6ca8246db1f47929f9238bfa3d2ab2c;hpb=647da28e487e48e78ba40aede9f5a485ef8725d0;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 47a1927..8fd295e 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -6,11 +6,16 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 # poison the environment
 if [[ "$POISON_ENV" = "true" ]] ; then
 
-  # look through lib, find all mentioned ENVvars and set them
-  # to true and see if anything explodes
-  for var in $(grep -P '\$ENV\{' -r lib/ | grep -oP 'DBIC_\w+' | sort -u | grep -v DBIC_TRACE) ; do
+  # in addition to making sure tests do not rely on implicid order of
+  # returned results, look through lib, find all mentioned ENVvars and
+  # set them to true and see if anything explodes
+  for var in \
+    DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER \
+    $(grep -P '\$ENV\{' -r lib/ --exclude-dir Optional | grep -oP '\bDBIC\w+' | sort -u | grep -v DBIC_TRACE)
+  do
     if [[ -z "${!var}" ]] ; then
       export $var=1
+      echo "POISON_ENV: setting $var to 1"
     fi
   done
 
@@ -18,8 +23,6 @@ if [[ "$POISON_ENV" = "true" ]] ; then
   export DBI_DSN="dbi:ODBC:server=NonexistentServerAddress"
   export DBI_DRIVER="ADO"
 
-  # make sure tests do not rely on implicid order of returned results
-  export DBICTEST_SQLITE_REVERSE_DEFAULT_ORDER=1
 
   # emulate a local::lib-like env
   # trick cpanm into executing true as shell - we just need the find+unpack
@@ -30,6 +33,26 @@ if [[ "$POISON_ENV" = "true" ]] ; then
 
   # perldoc -l <mod> searches $(pwd)/lib in addition to PERL5LIB etc, hence the cd /
   echo_err "Latest stable DBIC (without deps) locatable via \$PERL5LIB at $(cd / && perldoc -l DBIx::Class)"
+
+  # FIXME - this is a kludge in place of proper MDV testing. For the time
+  # being simply use the minimum versions of our DBI/DBDstack, to avoid
+  # fuckups like 0.08260 (went unnoticed for 5 months)
+  #
+  # use url-spec for DBI due to https://github.com/miyagawa/cpanminus/issues/328
+  if perl -M5.013003 -e1 &>/dev/null ; then
+    # earlier DBI will not compile without PERL_POLLUTE which was gone in 5.14
+    parallel_installdeps_notest T/TI/TIMB/DBI-1.614.tar.gz
+  else
+    parallel_installdeps_notest T/TI/TIMB/DBI-1.57.tar.gz
+  fi
+
+  # Test both minimum DBD::SQLite and minimum BigInt SQLite
+  if [[ "$CLEANTEST" = "true" ]]; then
+    parallel_installdeps_notest DBD::SQLite@1.37
+  else
+    parallel_installdeps_notest DBD::SQLite@1.29
+  fi
+
 fi
 
 if [[ "$CLEANTEST" = "true" ]]; then
@@ -54,19 +77,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
   # handholding
 
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    # Many dists still do not pass tests under tb1.5 properly (and it itself
-    # does not even install on things like 5.10). Install the *stable-dev*
-    # latest T::B here, so that it will not show up as a dependency, and
-    # hence it will not get installed a second time as an unsatisfied dep
-    # under cpanm --dev
+    # We are not "quite ready" for SQLA 1.99, do not consider it
     #
-    # L::U is a workaround for RT#92226 (argh)
-    installdeps 'Test::Builder~<1.005' 'List::Util~!=1.36'
+    installdeps 'SQL::Abstract~<1.99'
 
   elif ! CPAN_is_sane ; then
     # no configure_requires - we will need the usual suspects anyway
     # without pre-installing these in one pass things like extract_prereqs won't work
-    installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build P/PE/PEVANS/Scalar-List-Utils-1.35.tar.gz
+    installdeps ExtUtils::MakeMaker ExtUtils::CBuilder Module::Build
 
   fi
 
@@ -75,13 +93,6 @@ else
   # using SQLT and set up whatever databases necessary
   export DBICTEST_SQLT_DEPLOY=1
 
-  # FIXME - need new TB1.5 devrel
-  # if we run under --dev install latest github of TB1.5 first
-  # (unreleased workaround for precedence warnings)
-  if [[ "$DEVREL_DEPS" == "true" ]] ; then
-    parallel_installdeps_notest git://github.com/nthykier/test-more.git@fix-return-precedence-issue
-  fi
-
   # do the preinstall in several passes to minimize amount of cross-deps installing
   # multiple times, and to avoid module re-architecture breaking another install
   # (e.g. once Carp is upgraded there's no more Carp::Heavy,
@@ -91,14 +102,14 @@ else
   parallel_installdeps_notest File::Path
   parallel_installdeps_notest Carp
   parallel_installdeps_notest Module::Build
-  parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime 'List::Util~<1.36'
+  parallel_installdeps_notest File::Spec Data::Dumper Module::Runtime
   parallel_installdeps_notest Test::Exception Encode::Locale Test::Fatal
   parallel_installdeps_notest Test::Warn 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 Class::Trigger JSON::XS DBI DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
-  parallel_installdeps_notest Moose Module::Install JSON SQL::Translator File::Which
+  parallel_installdeps_notest YAML LWP Class::Trigger JSON::XS DateTime::Format::Builder Class::Accessor::Grouped Package::Variant
+  parallel_installdeps_notest SQL::Abstract Moose Module::Install JSON SQL::Translator File::Which Path::Class@0.34
 
-  if [[ -n "DBICTEST_FIREBIRD_DSN" ]] ; then
+  if [[ -n "$DBICTEST_FIREBIRD_INTERBASE_DSN" ]] ; then
     # the official version is very much outdated and does not compile on 5.14+
     # use this rather updated source tree (needs to go to PAUSE):
     # https://github.com/pilcrow/perl-dbd-interbase
@@ -120,14 +131,14 @@ if [[ "$CLEANTEST" = "true" ]]; then
   if [[ "$DEVREL_DEPS" != "true" ]] && ! CPAN_is_sane ; then
     # combat dzillirium on harness-wide level, otherwise breakage happens weekly
     echo_err "$(tstamp) Ancient CPAN.pm: engaging TAP::Harness::IgnoreNonessentialDzilAutogeneratedTests during dep install"
-    perl -MTAP::Harness=3.18 -e1 &>/dev/null || run_or_err "Upgrading TAP::Harness for HARNESS_SUBCLASS support" "cpan TAP::Harness"
+    perl -MTAP::Harness\ 3.18 -e1 &>/dev/null || run_or_err "Upgrading TAP::Harness for HARNESS_SUBCLASS support" "cpan TAP::Harness"
     export PERL5LIB="$(pwd)/maint/travis-ci_scripts/lib:$PERL5LIB"
     export HARNESS_SUBCLASS="TAP::Harness::IgnoreNonessentialDzilAutogeneratedTests"
     # sanity check, T::H does not report sensible errors when the subclass fails to load
     perl -MTAP::Harness::IgnoreNonessentialDzilAutogeneratedTests -e1
 
     # DBD::SQLite reasonably wants DBI at config time
-    HARD_DEPS="DBI $HARD_DEPS"
+    perl -MDBI -e1 &>/dev/null || HARD_DEPS="DBI $HARD_DEPS"
 
     # this is a fucked CPAN - won't understand configure_requires of
     # various pieces we may run into
@@ -195,10 +206,7 @@ while (@chunks) {
   fi
 
 else
-
-  # listalldeps is deliberate - will upgrade everything it can find
-  parallel_installdeps_notest $(make listalldeps | grep -v List::Util)
-
+  parallel_installdeps_notest "$(make listdeps)"
 fi
 
 echo_err "$(tstamp) Dependency installation finished"
@@ -215,6 +223,13 @@ if [[ -n "$(make listdeps)" ]] ; then
   exit 1
 fi
 
+# check that our MDV somewhat works
+if [[ "$POISON_ENV" = "true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\ 1.615 -e1 ) &>/dev/null ; then
+  echo_err "Something went wrong - higher versions of DBI and/or DBD::SQLite than we expected"
+  exit 1
+fi
+
+
 # announce what are we running
 echo_err "
 ===================== DEPENDENCY CONFIGURATION COMPLETE =====================