@@ -5,16 +5,16 @@ source maint/travis-ci_scripts/common.bash
5
5
6
6
if [[ -n " $SHORT_CIRCUIT_SMOKE " ]] ; then exit 0 ; fi
7
7
8
- # The prereq-install stage will not work with both POISON and DEVREL
8
+ # The DEVREL_DEPS prereq-install stage won't mix with MVDT
9
9
# DEVREL wins
10
- if [[ " $DEVREL_DEPS " = " true" ]] ; then
11
- export POISON_ENV =" "
10
+ if [[ " $DEVREL_DEPS " == " true" ]] ; then
11
+ export MVDT =" "
12
12
fi
13
13
14
14
# FIXME - this is a kludge in place of proper MDV testing. For the time
15
15
# being simply use the minimum versions of our DBI/DBDstack, to avoid
16
16
# fuckups like 0.08260 (went unnoticed for 5 months)
17
- if [[ " $POISON_ENV " = " true" ]] ; then
17
+ if [[ " $MVDT " = = " true" ]] ; then
18
18
19
19
# use url-spec for DBI due to https://github.com/miyagawa/cpanminus/issues/328
20
20
if [[ " $CLEANTEST " != " true" ]] || perl -M5.013003 -e1 & > /dev/null ; then
@@ -32,25 +32,38 @@ if [[ "$POISON_ENV" = "true" ]] ; then
32
32
else
33
33
parallel_installdeps_notest DBD::SQLite@1.29
34
34
fi
35
+ fi
35
36
36
- # also try minimal tested installs *without* a compiler
37
- if [[ " $CLEANTEST " = " true" ]]; then
37
+ #
38
+ # try minimal fully tested installs *without* a compiler (with some exceptions of course)
39
+ if [[ " $BREAK_CC " == " true" ]] ; then
38
40
39
- # FIXME - working around RT#74707, https://metacpan.org/source/DOY/Package-Stash-0.37/Makefile.PL#L112-122
40
- # List::Util can be excised after that as well (need to make my own max() routine for older perls)
41
- installdeps Sub::Name Clone Package::Stash::XS \
42
- $( perl -MList::Util\ 1.16 -e1 & > /dev/null || echo " List::Util" )
41
+ [[ " $CLEANTEST " != " true" ]] && echo_err " Breaking the compiler without CLEANTEST makes no sense" && exit 1
43
42
44
- mkdir -p " $HOME /bin" # this is already in $PATH, just doesn't exist
45
- run_or_err " Linking ~/bin/cc to /bin/false - thus essentially BREAKING the C compiler" \
46
- " ln -s /bin/false $HOME /bin/cc"
43
+ # FIXME - working around RT#74707, https://metacpan.org/source/DOY/Package-Stash-0.37/Makefile.PL#L112-122
44
+ # List::Util can be excised after that as well (need to make my own max() routine for older perls)
45
+ #
46
+ # DEVREL_DEPS means our installer is cpanm, which will respect failures
47
+ # and the like, so stuff soft-failing (failed deps that are not in fact
48
+ # needed) will not fly. Add *EVEN MORE* stuff that needs a compiler
49
+ #
50
+ # FIXME - the PathTools 3.47 is to work around https://rt.cpan.org/Ticket/Display.html?id=107392
51
+ #
52
+ installdeps Sub::Name Clone Package::Stash::XS \
53
+ $( perl -MList::Util\ 1.16 -e1 & > /dev/null || echo " List::Util" ) \
54
+ $( [[ " $DEVREL_DEPS " == " true" ]] && ( perl -MFile::Spec\ 3.13 -e1 & > /dev/null || echo " S/SM/SMUELLER/PathTools-3.47.tar.gz" ) ) \
55
+ $( perl -MDBI -e1 & > /dev/null || echo " DBI" ) \
56
+ $( perl -MDBD::SQLite -e1 & > /dev/null || echo " DBD::SQLite" )
47
57
48
- # FIXME: working around RT#113682, RT#113685
49
- installdeps Module::Build B::Hooks::EndOfScope
58
+ mkdir -p " $HOME /bin" # this is already in $PATH, just doesn't exist
59
+ run_or_err " Linking ~/bin/cc to /bin/false - thus essentially BREAKING the C compiler" \
60
+ " ln -s /bin/false $HOME /bin/cc"
50
61
51
- run_or_err " Linking ~/bin/cc to /bin/true - BREAKING the C compiler even harder" \
52
- " ln -fs /bin/true $HOME /bin/cc"
53
- fi
62
+ # FIXME: working around RT#113682, RT#113685, and some other unfiled bugs
63
+ installdeps Module::Build B::Hooks::EndOfScope Devel::GlobalDestruction Class::Accessor::Grouped
64
+
65
+ run_or_err " Linking ~/bin/cc to /bin/true - BREAKING the C compiler even harder" \
66
+ " ln -fs /bin/true $HOME /bin/cc"
54
67
fi
55
68
56
69
if [[ " $CLEANTEST " = " true" ]]; then
@@ -169,8 +182,8 @@ if [[ -n "$(make listdeps)" ]] ; then
169
182
exit 1
170
183
fi
171
184
172
- # check that our MDV somewhat works
173
- if [[ " $POISON_ENV " = " true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\ 1.615 -e1 ) & > /dev/null ; then
185
+ # check that our MVDT somewhat works
186
+ if [[ " $MVDT " = = " true" ]] && ( perl -MDBD::SQLite\ 1.38 -e1 || perl -MDBI\ 1.615 -e1 ) & > /dev/null ; then
174
187
echo_err " Something went wrong - higher versions of DBI and/or DBD::SQLite than we expected"
175
188
exit 1
176
189
fi
0 commit comments