Merge branch 'js/vsts-ci'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:26 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:26 +0000 (22:05 -0800)
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
...

12 files changed:
1  2 
Makefile
ci/install-dependencies.sh
ci/lib.sh
ci/run-build-and-tests.sh
ci/run-linux32-build.sh
compat/mingw.c
t/README
t/helper/test-date.c
t/helper/test-tool.c
t/helper/test-tool.h
t/t0061-run-command.sh
t/test-lib.sh
diff --cc Makefile
Simple merge
index dc719876bb12309c086952d275085d8d3d0690e6,bcdcc715924c53bbcf1418b7ddeee426c94468b8..608ff964dee0c15c2c2a97c15fc5a86d5138488a
@@@ -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 0000000000000000000000000000000000000000,c2bc6c68b9fef34be4e19cbb0b3ca94f794fba68..16f4ecbc67196b19f45d4e5c2273b8ea35e0895d
mode 000000,100755..100755
--- /dev/null
+++ b/ci/lib.sh
@@@ -1,0 -1,179 +1,188 @@@
 -      BREW_INSTALL_PACKAGES=
+ # Library of functions shared by all CI scripts
+ skip_branch_tip_with_tag () {
+       # Sometimes, a branch is pushed at the same time the tag that points
+       # at the same commit as the tip of the branch is pushed, and building
+       # both at the same time is a waste.
+       #
+       # When the build is triggered by a push to a tag, $CI_BRANCH will
+       # have that tagname, e.g. v2.14.0.  Let's see if $CI_BRANCH is
+       # exactly at a tag, and if so, if it is different from $CI_BRANCH.
+       # That way, we can tell if we are building the tip of a branch that
+       # is tagged and we can skip the build because we won't be skipping a
+       # build of a tag.
+       if TAG=$(git describe --exact-match "$CI_BRANCH" 2>/dev/null) &&
+               test "$TAG" != "$CI_BRANCH"
+       then
+               echo "$(tput setaf 2)Tip of $CI_BRANCH is exactly at $TAG$(tput sgr0)"
+               exit 0
+       fi
+ }
+ # Save some info about the current commit's tree, so we can skip the build
+ # job if we encounter the same tree again and can provide a useful info
+ # message.
+ save_good_tree () {
+       echo "$(git rev-parse $CI_COMMIT^{tree}) $CI_COMMIT $CI_JOB_NUMBER $CI_JOB_ID" >>"$good_trees_file"
+       # limit the file size
+       tail -1000 "$good_trees_file" >"$good_trees_file".tmp
+       mv "$good_trees_file".tmp "$good_trees_file"
+ }
+ # Skip the build job if the same tree has already been built and tested
+ # successfully before (e.g. because the branch got rebased, changing only
+ # the commit messages).
+ skip_good_tree () {
+       if ! good_tree_info="$(grep "^$(git rev-parse $CI_COMMIT^{tree}) " "$good_trees_file")"
+       then
+               # Haven't seen this tree yet, or no cached good trees file yet.
+               # Continue the build job.
+               return
+       fi
+       echo "$good_tree_info" | {
+               read tree prev_good_commit prev_good_job_number prev_good_job_id
+               if test "$CI_JOB_ID" = "$prev_good_job_id"
+               then
+                       cat <<-EOF
+                       $(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0)
+                       This commit has already been built and tested successfully by this build job.
+                       To force a re-build delete the branch's cache and then hit 'Restart job'.
+                       EOF
+               else
+                       cat <<-EOF
+                       $(tput setaf 2)Skipping build job for commit $CI_COMMIT.$(tput sgr0)
+                       This commit's tree has already been built and tested successfully in build job $prev_good_job_number for commit $prev_good_commit.
+                       The log of that build job is available at $(url_for_job_id $prev_good_job_id)
+                       To force a re-build delete the branch's cache and then hit 'Restart job'.
+                       EOF
+               fi
+       }
+       exit 0
+ }
+ check_unignored_build_artifacts ()
+ {
+       ! git ls-files --other --exclude-standard --error-unmatch \
+               -- ':/*' 2>/dev/null ||
+       {
+               echo "$(tput setaf 1)error: found unignored build artifacts$(tput sgr0)"
+               false
+       }
+ }
+ # Set 'exit on error' for all CI scripts to let the caller know that
+ # something went wrong.
+ # Set tracing executed commands, primarily setting environment variables
+ # and installing dependencies.
+ set -ex
+ 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"
+       }
 -if [ "$jobname" = linux-gcc ]; then
 -      export CC=gcc-8
 -fi
++      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"
+ skip_branch_tip_with_tag
+ skip_good_tree
+ if test -z "$jobname"
+ then
+       jobname="$CI_OS_NAME-$CC"
+ fi
+ export DEVELOPER=1
+ export DEFAULT_TEST_TARGET=prove
+ export GIT_TEST_CLONE_2GB=YesPlease
+ case "$jobname" in
+ linux-clang|linux-gcc)
++      if [ "$jobname" = linux-gcc ]
++      then
++              export CC=gcc-8
++      fi
++
+       export GIT_TEST_HTTPD=YesPlease
+       # The Linux build installs the defined dependency versions below.
+       # The OS X build installs the latest available versions. Keep that
+       # in mind when you encounter a broken OS X build!
+       export LINUX_P4_VERSION="16.2"
+       export LINUX_GIT_LFS_VERSION="1.5.2"
+       P4_PATH="$HOME/custom/p4"
+       GIT_LFS_PATH="$HOME/custom/git-lfs"
+       export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
+       ;;
+ osx-clang|osx-gcc)
++      if [ "$jobname" = osx-gcc ]
++      then
++              export CC=gcc-8
++      fi
++
+       # t9810 occasionally fails on Travis CI OS X
+       # t9816 occasionally fails with "TAP out of sequence errors" on
+       # Travis CI OS X
+       export GIT_SKIP_TESTS="t9810 t9816"
+       ;;
+ GIT_TEST_GETTEXT_POISON)
+       export GIT_TEST_GETTEXT_POISON=YesPlease
+       ;;
+ esac
++
++export MAKEFLAGS="CC=${CC:-cc}"
index 84431c097eb8dffa1b540ee61d6c047239afd18a,74d838ea01883031246cb83342c5daaa9545333a..cdd291344047394b26c17635d4507ad7ce14b542
@@@ -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
index 26c168a0165522655e4e80988ba553b314b333f5,09e9276e1276e089fdde09da4cb89f15404be416..e3a193adbce39cb62b3be20b269444188a900613
@@@ -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
  '
diff --cc compat/mingw.c
Simple merge
diff --cc t/README
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc t/test-lib.sh
Simple merge