From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2019 06:05:26 +0000 (-0800)
Subject: Merge branch 'js/vsts-ci'
X-Git-Tag: v2.21.0-rc0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57cbc53d3e0567d630b3e08be41e555efb06f616;p=thirdparty%2Fgit.git

Merge branch 'js/vsts-ci'

Prepare to run test suite on Azure Pipeline.

* js/vsts-ci: (22 commits)
  test-date: drop unused parameter to getnanos()
  ci: parallelize testing on Windows
  ci: speed up Windows phase
  tests: optionally skip bin-wrappers/
  t0061: workaround issues with --with-dashes and RUNTIME_PREFIX
  tests: add t/helper/ to the PATH with --with-dashes
  mingw: try to work around issues with the test cleanup
  tests: include detailed trace logs with --write-junit-xml upon failure
  tests: avoid calling Perl just to determine file sizes
  README: add a build badge (status of the Azure Pipelines build)
  mingw: be more generous when wrapping up the setitimer() emulation
  ci: use git-sdk-64-minimal build artifact
  ci: add a Windows job to the Azure Pipelines definition
  Add a build definition for Azure DevOps
  ci/lib.sh: add support for Azure Pipelines
  tests: optionally write results as JUnit-style .xml
  test-date: add a subcommand to measure times in shell scripts
  ci: use a junction on Windows instead of a symlink
  ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
  ci/lib.sh: encapsulate Travis-specific things
  ...
---

57cbc53d3e0567d630b3e08be41e555efb06f616
diff --cc ci/install-dependencies.sh
index dc719876bb,bcdcc71592..608ff964de
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@@ -37,14 -37,10 +37,15 @@@ osx-clang|osx-gcc
  	brew update --quiet
  	# Uncomment this if you want to run perf tests:
  	# brew install gnu-time
- 	brew install git-lfs gettext
+ 	test -z "$BREW_INSTALL_PACKAGES" ||
+ 	brew install $BREW_INSTALL_PACKAGES
  	brew link --force gettext
  	brew install caskroom/cask/perforce
 +	case "$jobname" in
 +	osx-gcc)
 +		brew link gcc@8
 +		;;
 +	esac
  	;;
  StaticAnalysis)
  	sudo apt-get -q update
diff --cc ci/lib.sh
index a479613a57,c2bc6c68b9..16f4ecbc67
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@@ -81,7 -80,60 +80,60 @@@ check_unignored_build_artifacts (
  # and installing dependencies.
  set -ex
  
- cache_dir="$HOME/travis-cache"
+ if test true = "$TRAVIS"
+ then
+ 	CI_TYPE=travis
+ 	# When building a PR, TRAVIS_BRANCH refers to the *target* branch. Not
+ 	# what we want here. We want the source branch instead.
+ 	CI_BRANCH="${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}"
+ 	CI_COMMIT="$TRAVIS_COMMIT"
+ 	CI_JOB_ID="$TRAVIS_JOB_ID"
+ 	CI_JOB_NUMBER="$TRAVIS_JOB_NUMBER"
+ 	CI_OS_NAME="$TRAVIS_OS_NAME"
+ 	CI_REPO_SLUG="$TRAVIS_REPO_SLUG"
+ 
+ 	cache_dir="$HOME/travis-cache"
+ 
+ 	url_for_job_id () {
+ 		echo "https://travis-ci.org/$CI_REPO_SLUG/jobs/$1"
+ 	}
+ 
+ 	BREW_INSTALL_PACKAGES="git-lfs gettext"
+ 	export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
+ 	export GIT_TEST_OPTS="--verbose-log -x --immediate"
+ 	export MAKEFLAGS="--jobs=2"
+ elif test -n "$SYSTEM_COLLECTIONURI" || test -n "$SYSTEM_TASKDEFINITIONSURI"
+ then
+ 	CI_TYPE=azure-pipelines
+ 	# We are running in Azure Pipelines
+ 	CI_BRANCH="$BUILD_SOURCEBRANCH"
+ 	CI_COMMIT="$BUILD_SOURCEVERSION"
+ 	CI_JOB_ID="$BUILD_BUILDID"
+ 	CI_JOB_NUMBER="$BUILD_BUILDNUMBER"
+ 	CI_OS_NAME="$(echo "$AGENT_OS" | tr A-Z a-z)"
+ 	test darwin != "$CI_OS_NAME" || CI_OS_NAME=osx
+ 	CI_REPO_SLUG="$(expr "$BUILD_REPOSITORY_URI" : '.*/\([^/]*/[^/]*\)$')"
+ 	CC="${CC:-gcc}"
+ 
+ 	# use a subdirectory of the cache dir (because the file share is shared
+ 	# among *all* phases)
+ 	cache_dir="$HOME/test-cache/$SYSTEM_PHASENAME"
+ 
+ 	url_for_job_id () {
+ 		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
+ 	}
+ 
 -	BREW_INSTALL_PACKAGES=
++	BREW_INSTALL_PACKAGES=gcc@8
+ 	export GIT_PROVE_OPTS="--timer --jobs 10 --state=failed,slow,save"
+ 	export GIT_TEST_OPTS="--verbose-log -x --write-junit-xml"
+ 	export MAKEFLAGS="--jobs=10"
+ 	test windows_nt != "$CI_OS_NAME" ||
+ 	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
+ else
+ 	echo "Could not identify CI type" >&2
+ 	exit 1
+ fi
+ 
  good_trees_file="$cache_dir/good-trees"
  
  mkdir -p "$cache_dir"
@@@ -96,9 -148,10 +148,7 @@@ f
  
  export DEVELOPER=1
  export DEFAULT_TEST_TARGET=prove
- export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- export GIT_TEST_OPTS="--verbose-log -x --immediate"
  export GIT_TEST_CLONE_2GB=YesPlease
 -if [ "$jobname" = linux-gcc ]; then
 -	export CC=gcc-8
 -fi
  
  case "$jobname" in
  linux-clang|linux-gcc)
diff --cc ci/run-build-and-tests.sh
index 84431c097e,74d838ea01..cdd2913440
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@@ -3,12 -3,15 +3,15 @@@
  # Build and test Git
  #
  
- . ${0%/*}/lib-travisci.sh
+ . ${0%/*}/lib.sh
  
- ln -s "$cache_dir/.prove" t/.prove
+ case "$CI_OS_NAME" in
+ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+ *) ln -s "$cache_dir/.prove" t/.prove;;
+ esac
  
- make --jobs=2
+ make
 -make --quiet test
 +make test
  if test "$jobname" = "linux-gcc"
  then
  	export GIT_TEST_SPLIT_INDEX=yes
diff --cc ci/run-linux32-build.sh
index 26c168a016,09e9276e12..e3a193adbc
--- a/ci/run-linux32-build.sh
+++ b/ci/run-linux32-build.sh
@@@ -55,6 -55,6 +55,6 @@@ linux32 --32bit i386 su -m -l $CI_USER 
  	set -ex
  	cd /usr/src/git
  	test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove
- 	make --jobs=2
+ 	make
 -	make --quiet test
 +	make test
  '