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

gitster · gitster · commit c710d182ea6d · 2018-03-08T12:36:23.000-08:00
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
diff --git a/.travis.yml b/.travis.yml
@@ -33,7 +33,6 @@ matrix:
       compiler:
       addons:
       before_install:
-      before_script:
       script:
         - >
           test "$TRAVIS_REPO_SLUG" != "git/git" ||
@@ -46,7 +45,6 @@ matrix:
       services:
         - docker
       before_install:
-      before_script:
       script: ci/run-linux32-docker.sh
     - env: jobname=StaticAnalysis
       os: linux
@@ -56,7 +54,6 @@ matrix:
           packages:
           - coccinelle
       before_install:
-      before_script:
       script: ci/run-static-analysis.sh
       after_failure:
     - env: jobname=Documentation
@@ -68,13 +65,11 @@ matrix:
           - asciidoc
           - xmlto
       before_install:
-      before_script:
       script: ci/test-documentation.sh
       after_failure:
 
 before_install: ci/install-dependencies.sh
-before_script: ci/run-build.sh
-script: ci/run-tests.sh
+script: ci/run-build-and-tests.sh
 after_failure: ci/print-test-failures.sh
 
 notifications:
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# Test Git
+# Build and test Git
 #
 
 . ${0%/*}/lib-travisci.sh
 
 ln -s "$cache_dir/.prove" t/.prove
 
+make --jobs=2
 make --quiet test
 if test "$jobname" = "linux-gcc"
 then
diff --git a/ci/run-build.sh b/ci/run-build.sh

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`		`-# Test Git`
	`3`	`+# Build and test Git`
`4`	`4`	`#`
`5`	`5`
`6`	`6`	`. ${0%/*}/lib-travisci.sh`
`7`	`7`
`8`	`8`	`ln -s "$cache_dir/.prove" t/.prove`
`9`	`9`
	`10`	`+make --jobs=2`
`10`	`11`	`make --quiet test`
`11`	`12`	`if test "$jobname" = "linux-gcc"`
`12`	`13`	`then`