On Tue, Nov 28, 2017 at 3:37 PM, Todd Zullinger <tmz@xxxxxxxxx> wrote: > A build requirement on tcl/tk was added in 01c54284f1 (Makefile: check > that tcl/tk is installed, 2017-11-20). For building and running the > tests, we don't need tcl/tk installed. Bypass the requirement. > > Signed-off-by: Todd Zullinger <tmz@xxxxxxxxx> > --- > > Junio C Hamano wrote: >> It seems that TravisCI objects ;-) >> >> https://travis-ci.org/git/git/jobs/307745929 > > Interesting that the main builds passed. I don't know what the default > 64-bit linuxinstall looks like in travis, so I presume it includes > tcl/tk or something. Yeah, interesting. I am cc'ing Lars who perhaps knows. > In any case, perhaps something like this is what we want? We could use > NO_TCLTK or ensure that tcl/tk is installed in all environments. I used > the BYPASS_TCLTK_CHECK option since the tests have been running without > tcl/tk previously. If they become required for the tests, this can be > adjusted. > > I have a travis job running with this change here: > > https://travis-ci.org/tmzullinger/git/builds/308452464 > > So far the only failure is (what looks like) an unrelated one in the > GETTEXT_POISON build. Yeah, I can't see how test failures in the t/ directory could be related. > .travis.yml | 1 + > ci/run-linux32-docker.sh | 1 + > 2 files changed, 2 insertions(+) The patch looks good to me. Thanks! I wonder if it would be better to squash it into my patch or to keep it separate. I am ok with both ways.
