From: Peter Rabbitson Date: Mon, 11 Apr 2016 18:24:21 +0000 (+0200) Subject: (travis) Reorganize POISON_ENV mode X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=179566f35d9aa5ad85a7516ae37e268217b88ede;p=dbsrgits%2FDBIx-Class.git (travis) Reorganize POISON_ENV mode Allow MVDT and BREAK_CC to be separate settings, will make sense in further commits. This adds extra testing of DEVREL_DEPS with no compiler, which brings another round of exceptions etc... sigh Read under -w --- diff --git a/maint/travis-ci_scripts/20_install.bash b/maint/travis-ci_scripts/20_install.bash index 515b176..490ceb7 100755 --- a/maint/travis-ci_scripts/20_install.bash +++ b/maint/travis-ci_scripts/20_install.bash @@ -86,6 +86,17 @@ fi # poison the environment if [[ "$POISON_ENV" = "true" ]] ; then + toggle_vars=( MVDT ) + + [[ "$CLEANTEST" == "true" ]] && toggle_vars+=( BREAK_CC ) + + for var in "${toggle_vars[@]}" ; do + if [[ -z "${!var}" ]] ; then + export $var=true + echo "POISON_ENV: setting $var to 'true'" + fi + done + # look through lib, find all mentioned DBIC* ENVvars and set them to true and see if anything explodes toggle_booleans=( $( grep -ohP '\bDBIC_[0-9_A-Z]+' -r lib/ --exclude-dir Optional | sort -u | grep -vP '^(DBIC_TRACE(_PROFILE)?|DBIC_.+_DEBUG)$' ) ) diff --git a/maint/travis-ci_scripts/30_before_script.bash b/maint/travis-ci_scripts/30_before_script.bash index 9f1ebd0..79a360d 100755 --- a/maint/travis-ci_scripts/30_before_script.bash +++ b/maint/travis-ci_scripts/30_before_script.bash @@ -5,16 +5,16 @@ source maint/travis-ci_scripts/common.bash if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then exit 0 ; fi -# The prereq-install stage will not work with both POISON and DEVREL +# The DEVREL_DEPS prereq-install stage won't mix with MVDT # DEVREL wins -if [[ "$DEVREL_DEPS" = "true" ]] ; then - export POISON_ENV="" +if [[ "$DEVREL_DEPS" == "true" ]] ; then + export MVDT="" fi # 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) -if [[ "$POISON_ENV" = "true" ]] ; then +if [[ "$MVDT" == "true" ]] ; then # use url-spec for DBI due to https://github.com/miyagawa/cpanminus/issues/328 if [[ "$CLEANTEST" != "true" ]] || perl -M5.013003 -e1 &>/dev/null ; then @@ -32,25 +32,38 @@ if [[ "$POISON_ENV" = "true" ]] ; then else parallel_installdeps_notest DBD::SQLite@1.29 fi +fi - # also try minimal tested installs *without* a compiler - if [[ "$CLEANTEST" = "true" ]]; then +# +# try minimal fully tested installs *without* a compiler (with some exceptions of course) +if [[ "$BREAK_CC" == "true" ]] ; then - # 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) - installdeps Sub::Name Clone Package::Stash::XS \ - $( perl -MList::Util\ 1.16 -e1 &>/dev/null || echo "List::Util" ) + [[ "$CLEANTEST" != "true" ]] && echo_err "Breaking the compiler without CLEANTEST makes no sense" && exit 1 - mkdir -p "$HOME/bin" # this is already in $PATH, just doesn't exist - 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#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 + # needed) will not fly. Add *EVEN MORE* stuff that needs a compiler + # + # 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" ) - # FIXME: working around RT#113682, RT#113685 - installdeps Module::Build B::Hooks::EndOfScope + mkdir -p "$HOME/bin" # this is already in $PATH, just doesn't exist + run_or_err "Linking ~/bin/cc to /bin/false - thus essentially BREAKING the C compiler" \ + "ln -s /bin/false $HOME/bin/cc" - run_or_err "Linking ~/bin/cc to /bin/true - BREAKING the C compiler even harder" \ - "ln -fs /bin/true $HOME/bin/cc" - fi + # FIXME: working around RT#113682, RT#113685, and some other unfiled bugs + installdeps Module::Build B::Hooks::EndOfScope 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" fi if [[ "$CLEANTEST" = "true" ]]; then @@ -169,8 +182,8 @@ 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 +# check that our MVDT somewhat works +if [[ "$MVDT" == "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 diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash index 16c90d5..8b44371 100755 --- a/maint/travis-ci_scripts/50_after_success.bash +++ b/maint/travis-ci_scripts/50_after_success.bash @@ -11,6 +11,9 @@ export HARNESS_OPTIONS="j$VCPU_USE" if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then + + [[ "$BREAK_CC" == "true" ]] && run_or_err "Unbreaking previously broken ~/bin/cc" "rm $HOME/bin/cc" + # FIXME - Devel::Cover (brought by Test::Strict, but soon needed anyway) # does not test cleanly on 5.8.7 - just get it directly if perl -M5.008007 -e1 &>/dev/null && ! perl -M5.008008 -e1 &>/dev/null; then