X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=maint%2Ftravis-ci_scripts%2F30_before_script.bash;h=958f2d853884c6d5f0e538ec7ca012d3affaf947;hb=9d0785d5dc8143fc41584fed2f8f9da7811e31c1;hp=3965bca128eb74bd83e433daaa13e285f37ff469;hpb=64d48e1989b06ff4cdb33eb7b16846d511168c64;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 3965bca..958f2d8 100755
--- a/maint/travis-ci_scripts/30_before_script.bash
+++ b/maint/travis-ci_scripts/30_before_script.bash
@@ -24,7 +24,7 @@ if is_cperl ; then
 
 fi
 
-# FIXME - this is a kludge in place of proper MDV testing. For the time
+# FIXME - this is a kludge in place of proper MVDT 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)
 if [[ "$MVDT" == "true" ]] ; then
@@ -54,7 +54,6 @@ if [[ "$BREAK_CC" == "true" ]] ; then
   [[ "$CLEANTEST" != "true" ]] && echo_err "Breaking the compiler without CLEANTEST makes no sense" && exit 1
 
   # FIXME - working around RT#74707, https://metacpan.org/source/DOY/Package-Stash-0.37/Makefile.PL#L112-122
-  # List::Util can be excised after that as well (need to make my own max() routine for older perls)
   #
   # DEVREL_DEPS means our installer is cpanm, which will respect failures
   # and the like, so stuff soft-failing (failed deps that are not in fact
@@ -63,7 +62,6 @@ if [[ "$BREAK_CC" == "true" ]] ; then
   # FIXME - the PathTools 3.47 is to work around https://rt.cpan.org/Ticket/Display.html?id=107392
   #
   installdeps Sub::Name Clone Package::Stash::XS \
-              $( perl -MList::Util\ 1.16 -e1 &>/dev/null || echo "List::Util" ) \
               $( [[ "$DEVREL_DEPS" == "true" ]] && ( perl -MFile::Spec\ 3.13 -e1 &>/dev/null || echo "S/SM/SMUELLER/PathTools-3.47.tar.gz" ) ) \
               $( perl -MDBI -e1 &>/dev/null || echo "DBI" ) \
               $( perl -MDBD::SQLite -e1 &>/dev/null || echo "DBD::SQLite" )
@@ -72,8 +70,8 @@ if [[ "$BREAK_CC" == "true" ]] ; then
   run_or_err "Linking ~/bin/cc to /bin/false - thus essentially BREAKING the C compiler" \
              "ln -s /bin/false $HOME/bin/cc"
 
-  # FIXME: working around RT#113682, RT#113685, and some other unfiled bugs
-  installdeps Module::Build B::Hooks::EndOfScope Devel::GlobalDestruction Class::Accessor::Grouped
+  # FIXME: working around RT#113682, and some other unfiled bugs
+  installdeps Module::Build Devel::GlobalDestruction Class::Accessor::Grouped
 
   run_or_err "Linking ~/bin/cc to /bin/true - BREAKING the C compiler even harder" \
              "ln -fs /bin/true $HOME/bin/cc"