From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 8 Mar 2018 20:36:23 +0000 (-0800)
Subject: Merge branch 'sg/travis-build-during-script-phase'
X-Git-Tag: v2.17.0-rc0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8;p=thirdparty%2Fgit.git

Merge branch 'sg/travis-build-during-script-phase'

Build the executable in 'script' phase in Travis CI integration, to
follow the established practice, rather than during 'before_script'
phase.  This allows the CI categorize the failures better ('failed'
is project's fault, 'errored' is build environment's).

* sg/travis-build-during-script-phase:
  travis-ci: build Git during the 'script' phase
---

c710d182ea6d3846f6f2dc6f1b6c7dbd35c2fce8
diff --cc ci/run-build-and-tests.sh
index 73e273fac7,d3a094603f..3735ce413f
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@@ -5,13 -5,10 +5,14 @@@
  
  . ${0%/*}/lib-travisci.sh
  
 -ln -s $HOME/travis-cache/.prove t/.prove
 +ln -s "$cache_dir/.prove" t/.prove
  
+ make --jobs=2
  make --quiet test
 +if test "$jobname" = "linux-gcc"
 +then
 +	GIT_TEST_SPLIT_INDEX=YesPlease make --quiet test
 +fi
  
  check_unignored_build_artifacts