From a1c928e70cd995426449ac6ec6df3b5a492580e5 Mon Sep 17 00:00:00 2001
From: Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 15:32:58 +0300
Subject: ci: Do not hide ci directory (#6410)

---
 ci/after_success.sh  |   8 +++
 ci/before_cache.sh   |  16 ++++++
 ci/before_install.sh |  25 +++++++++
 ci/before_script.sh  |  34 ++++++++++++
 ci/build.bat         |  54 +++++++++++++++++++
 ci/common/build.sh   |  81 ++++++++++++++++++++++++++++
 ci/common/test.sh    | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++
 ci/install.sh        |  23 ++++++++
 ci/run_tests.sh      |  25 +++++++++
 ci/script.sh         |  18 +++++++
 10 files changed, 432 insertions(+)
 create mode 100755 ci/after_success.sh
 create mode 100755 ci/before_cache.sh
 create mode 100755 ci/before_install.sh
 create mode 100755 ci/before_script.sh
 create mode 100644 ci/build.bat
 create mode 100644 ci/common/build.sh
 create mode 100644 ci/common/test.sh
 create mode 100755 ci/install.sh
 create mode 100755 ci/run_tests.sh
 create mode 100755 ci/script.sh

(limited to 'ci')

diff --git a/ci/after_success.sh b/ci/after_success.sh
new file mode 100755
index 0000000000..0215eb139b
--- /dev/null
+++ b/ci/after_success.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${GCOV}" ]]; then
+  coveralls --gcov "$(which "${GCOV}")" --encoding iso-8859-1 || echo 'coveralls upload failed.'
+fi
diff --git a/ci/before_cache.sh b/ci/before_cache.sh
new file mode 100755
index 0000000000..dd1fcf2bf7
--- /dev/null
+++ b/ci/before_cache.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+# Don't cache pip's log and selfcheck.
+rm -rf "${HOME}/.cache/pip/log"
+rm -f "${HOME}/.cache/pip/selfcheck.json"
+
+# Update the third-party dependency cache only if the build was successful.
+if [[ -f "${SUCCESS_MARKER}" ]]; then
+  rm -rf "${HOME}/.cache/nvim-deps"
+  mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
+  touch "${CACHE_MARKER}"
+  echo "Updated third-party dependencies (timestamp: $(stat -c '%y' "${CACHE_MARKER}"))."
+fi
diff --git a/ci/before_install.sh b/ci/before_install.sh
new file mode 100755
index 0000000000..9aac37de12
--- /dev/null
+++ b/ci/before_install.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  exit
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  brew update
+fi
+
+echo "Upgrade Python 2 pip."
+pip2.7 -q install --user --upgrade pip
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  echo "Install Python 3."
+  brew install python3
+  echo "Upgrade Python 3 pip."
+  pip3 -q install --user --upgrade pip
+else
+  echo "Upgrade Python 3 pip."
+  pip3 -q install --user --upgrade pip
+fi
diff --git a/ci/before_script.sh b/ci/before_script.sh
new file mode 100755
index 0000000000..4a75e89fbe
--- /dev/null
+++ b/ci/before_script.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  exit
+fi
+
+CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${CI_DIR}/common/build.sh"
+
+# Test some of the configuration variables.
+if [[ -n "${GCOV}" ]] && [[ ! $(type -P "${GCOV}") ]]; then
+  echo "\$GCOV: '${GCOV}' is not executable."
+  exit 1
+fi
+if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; then
+  echo "\$LLVM_SYMBOLIZER: '${LLVM_SYMBOLIZER}' is not executable."
+  exit 1
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  # Adds user to a dummy group.
+  # That allows to test changing the group of the file by `os_fchown`.
+  sudo dscl . -create /Groups/chown_test
+  sudo dscl . -append /Groups/chown_test GroupMembership "${USER}"
+fi
+
+# Compile dependencies.
+build_deps
+
+rm -rf "${LOG_DIR}"
+mkdir -p "${LOG_DIR}"
diff --git a/ci/build.bat b/ci/build.bat
new file mode 100644
index 0000000000..87a171b994
--- /dev/null
+++ b/ci/build.bat
@@ -0,0 +1,54 @@
+:: These are native MinGW builds, but they use the toolchain inside
+:: MSYS2, this allows using all the dependencies and tools available
+:: in MSYS2, but we cannot build inside the MSYS2 shell.
+echo on
+if "%CONFIGURATION%" == "MINGW_32" (
+  set ARCH=i686
+  set BITS=32
+) else (
+  set ARCH=x86_64
+  set BITS=64
+)
+:: We cannot have sh.exe in the PATH (MinGW)
+set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+set PATH=C:\msys64\mingw%BITS%\bin;C:\Windows\System32;C:\Windows;%PATH%
+:: The default cpack in the PATH is not CMake
+set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH%
+
+:: Build third-party dependencies
+C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" || goto :error
+C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils gperf" || goto :error
+
+:: Setup python (use AppVeyor system python)
+C:\Python27\python.exe -m pip install neovim || goto :error
+C:\Python35\python.exe -m pip install neovim || goto :error
+:: Disambiguate python3
+move c:\Python35\python.exe c:\Python35\python3.exe
+set PATH=C:\Python35;C:\Python27;%PATH%
+:: Sanity check
+python  -c "import neovim; print(str(neovim))" || goto :error
+python3 -c "import neovim; print(str(neovim))" || goto :error
+
+mkdir .deps
+cd .deps
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release ..\third-party\ || goto :error
+mingw32-make VERBOSE=1 || goto :error
+cd ..
+
+:: Build Neovim
+mkdir build
+cd build
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=gtest -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
+mingw32-make VERBOSE=1 || goto :error
+bin\nvim --version || goto :error
+
+:: Functional tests
+mingw32-make functionaltest VERBOSE=1 || goto :error
+
+:: Build artifacts
+cpack -G ZIP -C Release
+if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C Release
+
+goto :EOF
+:error
+exit /b %errorlevel%
diff --git a/ci/common/build.sh b/ci/common/build.sh
new file mode 100644
index 0000000000..44087513ee
--- /dev/null
+++ b/ci/common/build.sh
@@ -0,0 +1,81 @@
+build_deps() {
+  if [[ "${BUILD_32BIT}" == ON ]]; then
+    DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
+  fi
+  if [[ "${FUNCTIONALTEST}" == "functionaltest-lua" ]]; then
+    DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
+  fi
+
+  rm -rf "${DEPS_BUILD_DIR}"
+
+  # If there is a valid cache and we're not forced to recompile,
+  # use cached third-party dependencies.
+  if [[ -f "${CACHE_MARKER}" ]] && [[ "${BUILD_NVIM_DEPS}" != true ]]; then
+    if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+      local statcmd="stat -f '%Sm'"
+    else
+      local statcmd="stat -c '%y'"
+    fi
+    echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))."
+
+     mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
+     mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
+  else
+    mkdir -p "${DEPS_BUILD_DIR}"
+  fi
+
+  # Even if we're using cached dependencies, run CMake and make to
+  # update CMake configuration and update to newer deps versions.
+  cd "${DEPS_BUILD_DIR}"
+  echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
+  CC= cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
+
+  if ! ${MAKE_CMD}; then
+    exit 1
+  fi
+
+  cd "${TRAVIS_BUILD_DIR}"
+}
+
+prepare_build() {
+  if [[ -n "${CLANG_SANITIZER}" ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
+  fi
+  if [[ "${BUILD_32BIT}" == ON ]]; then
+    CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
+  fi
+
+  mkdir -p "${BUILD_DIR}"
+  cd "${BUILD_DIR}"
+  echo "Configuring with '${CMAKE_FLAGS} $@'."
+  cmake ${CMAKE_FLAGS} "$@" "${TRAVIS_BUILD_DIR}"
+}
+
+build_nvim() {
+  echo "Building nvim."
+  if ! ${MAKE_CMD} nvim; then
+    exit 1
+  fi
+
+  if [ "$CLANG_SANITIZER" != "TSAN" ]; then
+    echo "Building libnvim."
+    if ! ${MAKE_CMD} libnvim; then
+      exit 1
+    fi
+
+    echo "Building nvim-test."
+    if ! ${MAKE_CMD} nvim-test; then
+      exit 1
+    fi
+  fi
+
+  # Invoke nvim to trigger *San early.
+  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall'); then
+    asan_check "${LOG_DIR}"
+    exit 1
+  fi
+  asan_check "${LOG_DIR}"
+
+
+  cd "${TRAVIS_BUILD_DIR}"
+}
diff --git a/ci/common/test.sh b/ci/common/test.sh
new file mode 100644
index 0000000000..b28e46a4df
--- /dev/null
+++ b/ci/common/test.sh
@@ -0,0 +1,148 @@
+print_core() {
+  local app="$1"
+  local core="$2"
+  if test "$app" = quiet ; then
+    echo "Found core $core"
+    return 0
+  fi
+  echo "======= Core file $core ======="
+  if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+    lldb -Q -o "bt all" -f "${app}" -c "${core}"
+  else
+    gdb -n -batch -ex 'thread apply all bt full' "${app}" -c "${core}"
+  fi
+}
+
+check_core_dumps() {
+  local del=
+  if test "$1" = "--delete" ; then
+    del=1
+    shift
+  fi
+  local app="${1:-${BUILD_DIR}/bin/nvim}"
+  if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+    local cores="$(find /cores/ -type f -print)"
+  else
+    local cores="$(find ./ -type f -name 'core.*' -print)"
+  fi
+
+  if [ -z "${cores}" ]; then
+    return
+  fi
+  local core
+  for core in $cores; do
+    if test "$del" = "1" ; then
+      print_core "$app" "$core" >&2
+      rm "$core"
+    else
+      print_core "$app" "$core"
+    fi
+  done
+  if test "$app" = quiet ; then
+    return 0
+  fi
+  exit 1
+}
+
+check_logs() {
+  # Iterate through each log to remove an useless warning.
+  for log in $(find "${1}" -type f -name "${2}"); do
+    sed -i "${log}" \
+      -e '/Warning: noted but unhandled ioctl/d' \
+      -e '/could cause spurious value errors to appear/d' \
+      -e '/See README_MISSING_SYSCALL_OR_IOCTL for guidance/d'
+  done
+
+  # Now do it again, but only consider files with size > 0.
+  local err=""
+  for log in $(find "${1}" -type f -name "${2}" -size +0); do
+    cat "${log}"
+    err=1
+  done
+  if [[ -n "${err}" ]]; then
+    echo "Runtime errors detected."
+    exit 1
+  fi
+}
+
+valgrind_check() {
+  check_logs "${1}" "valgrind-*"
+}
+
+asan_check() {
+  check_logs "${1}" "*san.*"
+}
+
+run_unittests() {
+  ulimit -c unlimited
+  if ! ${MAKE_CMD} -C "${BUILD_DIR}" unittest ; then
+    check_core_dumps "$(which luajit)"
+    exit 1
+  fi
+  check_core_dumps "$(which luajit)"
+}
+
+run_functionaltests() {
+  ulimit -c unlimited
+  if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then
+    asan_check "${LOG_DIR}"
+    valgrind_check "${LOG_DIR}"
+    check_core_dumps
+    exit 1
+  fi
+  asan_check "${LOG_DIR}"
+  valgrind_check "${LOG_DIR}"
+  check_core_dumps
+}
+
+run_oldtests() {
+  ulimit -c unlimited
+  if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
+    reset
+    asan_check "${LOG_DIR}"
+    valgrind_check "${LOG_DIR}"
+    check_core_dumps
+    exit 1
+  fi
+  asan_check "${LOG_DIR}"
+  valgrind_check "${LOG_DIR}"
+  check_core_dumps
+}
+
+install_nvim() {
+  ${MAKE_CMD} -C "${BUILD_DIR}" install
+
+  "${INSTALL_PREFIX}/bin/nvim" --version
+  "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' || {
+    echo "Running ':help' in the installed nvim failed."
+    echo "Maybe the helptags have not been generated properly."
+    exit 1
+  }
+
+  local genvimsynf=syntax/vim/generated.vim
+  # Check that all runtime files were installed
+  for file in doc/tags $genvimsynf $(
+    cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
+  ) ; do
+    if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
+      echo "It appears that $file is not installed."
+      exit 1
+    fi
+  done
+
+  # Check that generated syntax file has function names, #5060.
+  local gpat='syn keyword vimFuncName .*eval'
+  if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then
+    echo "It appears that $genvimsynf does not contain $gpat."
+    exit 1
+  fi
+
+  for file in $(
+    cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
+  ) ; do
+    if ! test -x "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
+      echo "It appears that $file is not installed or is not executable."
+      exit 1
+    fi
+  done
+}
diff --git a/ci/install.sh b/ci/install.sh
new file mode 100755
index 0000000000..98d3dc01cb
--- /dev/null
+++ b/ci/install.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  exit
+fi
+
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  brew install gettext
+  brew reinstall -s libtool
+fi
+
+# Use default CC to avoid compilation problems when installing Python modules.
+echo "Install neovim module and coveralls for Python 2."
+CC=cc pip2.7 -q install --user --upgrade neovim cpp-coveralls
+
+echo "Install neovim module for Python 3."
+CC=cc pip3 -q install --user --upgrade neovim
+
+echo "Install neovim RubyGem."
+gem install --no-document --version ">= 0.2.0" neovim
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
new file mode 100755
index 0000000000..6347ac15d4
--- /dev/null
+++ b/ci/run_tests.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${CI_DIR}/common/build.sh"
+source "${CI_DIR}/common/test.sh"
+
+check_core_dumps --delete quiet
+
+prepare_build
+build_nvim
+
+if [ "$CLANG_SANITIZER" != "TSAN" ]; then
+  # Additional threads are only created when the builtin UI starts, which
+  # doesn't happen in the unit/functional tests
+  run_unittests
+  run_functionaltests
+fi
+run_oldtests
+
+install_nvim
+
+touch "${SUCCESS_MARKER}"
diff --git a/ci/script.sh b/ci/script.sh
new file mode 100755
index 0000000000..79a1bec201
--- /dev/null
+++ b/ci/script.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+if [[ -n "${CI_TARGET}" ]]; then
+  make "${CI_TARGET}"
+  exit 0
+fi
+
+# This will pass the environment variables down to a bash process which runs
+# as $USER, while retaining the environment variables defined and belonging
+# to secondary groups given above in usermod.
+if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  sudo -E su "${USER}" -c "ci/run_tests.sh"
+else
+  ci/run_tests.sh
+fi
-- 
cgit 


From 2bf9d36ccd59f12e3895c885e8cf17e620bf191b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 16:02:53 +0300
Subject: ci: Refactor CI scripts

1. CI_TARGET now determines which run_${CI_TARGET}.sh script to use. Defaults to
   `tests`.
2. Build no longer halts on the first failing suit: e.g. if functional tests
   failed it will continue with unit tests, etc.
3. All ${MAKE_CMD} occurrences moved to `top_make` function, added `build_make`
   as an alias to `make -C build` (`"${MAKE_CMD}" -C "${BUILD_DIR}"`) which is
   too verbose.

`suite.sh` was copied from powerline (tests/common.sh file), assumes running
with POSIX shells (and actually uses dash in powerline). Then some convenience
functions were added (run_test and below).
---
 ci/common/build.sh | 16 ++++++++++++----
 ci/common/suite.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 ci/common/test.sh  |  8 +++++---
 ci/run_lint.sh     | 17 +++++++++++++++++
 ci/run_tests.sh    | 17 ++++++++++++-----
 ci/script.sh       |  9 ++-------
 6 files changed, 103 insertions(+), 19 deletions(-)
 create mode 100644 ci/common/suite.sh
 create mode 100755 ci/run_lint.sh

(limited to 'ci')

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 44087513ee..19c23bdda8 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -1,3 +1,11 @@
+top_make() {
+  "${MAKE_CMD}" "$@"
+}
+
+build_make() {
+  top_make -C "${BUILD_DIR}" "$@"
+}
+
 build_deps() {
   if [[ "${BUILD_32BIT}" == ON ]]; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
@@ -30,7 +38,7 @@ build_deps() {
   echo "Configuring with '${DEPS_CMAKE_FLAGS}'."
   CC= cmake ${DEPS_CMAKE_FLAGS} "${TRAVIS_BUILD_DIR}/third-party/"
 
-  if ! ${MAKE_CMD}; then
+  if ! top_make; then
     exit 1
   fi
 
@@ -53,18 +61,18 @@ prepare_build() {
 
 build_nvim() {
   echo "Building nvim."
-  if ! ${MAKE_CMD} nvim; then
+  if ! top_make nvim; then
     exit 1
   fi
 
   if [ "$CLANG_SANITIZER" != "TSAN" ]; then
     echo "Building libnvim."
-    if ! ${MAKE_CMD} libnvim; then
+    if ! top_make libnvim; then
       exit 1
     fi
 
     echo "Building nvim-test."
-    if ! ${MAKE_CMD} nvim-test; then
+    if ! top_make nvim-test; then
       exit 1
     fi
   fi
diff --git a/ci/common/suite.sh b/ci/common/suite.sh
new file mode 100644
index 0000000000..ad7c30708f
--- /dev/null
+++ b/ci/common/suite.sh
@@ -0,0 +1,55 @@
+FAILED=0
+
+FAIL_SUMMARY=""
+
+enter_suite() {
+  local suite_name="$1"
+  export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
+}
+
+exit_suite() {
+  if test $FAILED -ne 0 ; then
+    echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
+    echo "${FAIL_SUMMARY}"
+  fi
+  export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
+  if test "x$1" != "x--continue" ; then
+    exit $FAILED
+  fi
+}
+
+fail() {
+  local allow_failure=
+  if test "x$1" = "x--allow-failure" ; then
+    shift
+    allow_failure=A
+  fi
+  local test_name="$1"
+  local fail_char="$allow_failure$2"
+  local message="$3"
+
+  : ${fail_char:=F}
+  : ${message:=Test $test_name failed}
+
+  local full_msg="$fail_char $NVIM_TEST_CURRENT_SUITE|$test_name :: $message"
+  FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
+  echo "Failed: $full_msg"
+  if test "x$allow_failure" = "x" ; then
+    FAILED=1
+  fi
+}
+
+run_test() {
+  local cmd="$1"
+  shift
+  local test_name="$1"
+  : ${test_name:=$cmd}
+  shift
+  if ! eval "$cmd" ; then
+    fail "${test_name}" "$@"
+  fi
+}
+
+succeeded() {
+  return $FAILED
+}
diff --git a/ci/common/test.sh b/ci/common/test.sh
index b28e46a4df..4936992cfd 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -1,3 +1,5 @@
+source "${CI_DIR}/common/build.sh"
+
 print_core() {
   local app="$1"
   local core="$2"
@@ -75,7 +77,7 @@ asan_check() {
 
 run_unittests() {
   ulimit -c unlimited
-  if ! ${MAKE_CMD} -C "${BUILD_DIR}" unittest ; then
+  if ! build_make unittest ; then
     check_core_dumps "$(which luajit)"
     exit 1
   fi
@@ -84,7 +86,7 @@ run_unittests() {
 
 run_functionaltests() {
   ulimit -c unlimited
-  if ! ${MAKE_CMD} -C "${BUILD_DIR}" ${FUNCTIONALTEST}; then
+  if ! build_make ${FUNCTIONALTEST}; then
     asan_check "${LOG_DIR}"
     valgrind_check "${LOG_DIR}"
     check_core_dumps
@@ -110,7 +112,7 @@ run_oldtests() {
 }
 
 install_nvim() {
-  ${MAKE_CMD} -C "${BUILD_DIR}" install
+  build_make install
 
   "${INSTALL_PREFIX}/bin/nvim" --version
   "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' || {
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
new file mode 100755
index 0000000000..c7937930d1
--- /dev/null
+++ b/ci/run_lint.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${CI_DIR}/common/build.sh"
+source "${CI_DIR}/common/suite.sh"
+
+enter_suite 'lint'
+
+run_test 'top_make clint-full' clint
+run_test 'top_make testlint' testlint
+run_test 'top_make check-single-includes' single-includes
+
+exit_suite
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 6347ac15d4..b552e1f520 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -6,6 +6,9 @@ set -o pipefail
 CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
+source "${CI_DIR}/common/suite.sh"
+
+enter_suite tests
 
 check_core_dumps --delete quiet
 
@@ -15,11 +18,15 @@ build_nvim
 if [ "$CLANG_SANITIZER" != "TSAN" ]; then
   # Additional threads are only created when the builtin UI starts, which
   # doesn't happen in the unit/functional tests
-  run_unittests
-  run_functionaltests
+  run_test run_unittests
+  run_test run_functionaltests
 fi
-run_oldtests
+run_test run_oldtests
+
+run_test install_nvim
 
-install_nvim
+if succeeded ; then
+  touch "${SUCCESS_MARKER}"
+fi
 
-touch "${SUCCESS_MARKER}"
+exit_suite
diff --git a/ci/script.sh b/ci/script.sh
index 79a1bec201..a59c40cd2d 100755
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -3,16 +3,11 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
-  make "${CI_TARGET}"
-  exit 0
-fi
-
 # This will pass the environment variables down to a bash process which runs
 # as $USER, while retaining the environment variables defined and belonging
 # to secondary groups given above in usermod.
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-  sudo -E su "${USER}" -c "ci/run_tests.sh"
+  sudo -E su "${USER}" -c "ci/run_${CI_TARGET}.sh"
 else
-  ci/run_tests.sh
+  ci/run_${CI_TARGET}.sh
 fi
-- 
cgit 


From 2da3caef1b4d34de3403071b9bf54c7339f3c609 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 16:17:38 +0300
Subject: ci: Do not quote MAKE_CMD

---
 ci/common/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 19c23bdda8..129622b522 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -1,5 +1,5 @@
 top_make() {
-  "${MAKE_CMD}" "$@"
+  ${MAKE_CMD} "$@"
 }
 
 build_make() {
-- 
cgit 


From 4c20733f6bbdcfe2a230766aa6b602681a399ac8 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 16:19:47 +0300
Subject: ci: Add ${NL} variable

---
 ci/common/suite.sh | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index ad7c30708f..e8c6a2b07a 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -1,3 +1,7 @@
+# HACK: get newline for use in strings given that "\n" and $'' do not work.
+NL="$(printf '\nE')"
+NL="${NL%E}"
+
 FAILED=0
 
 FAIL_SUMMARY=""
-- 
cgit 


From d9069b9fe490e3be3ac06985f7f8625af51d5129 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 17:39:18 +0300
Subject: ci: Check for exact value of CI_TARGET, not its emptyness

---
 ci/before_install.sh | 2 +-
 ci/before_script.sh  | 2 +-
 ci/install.sh        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ci')

diff --git a/ci/before_install.sh b/ci/before_install.sh
index 9aac37de12..5b36adaef2 100755
--- a/ci/before_install.sh
+++ b/ci/before_install.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
+if [[ "${CI_TARGET}" == lint ]]; then
   exit
 fi
 
diff --git a/ci/before_script.sh b/ci/before_script.sh
index 4a75e89fbe..445996a8df 100755
--- a/ci/before_script.sh
+++ b/ci/before_script.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
+if [[ "${CI_TARGET}" == lint ]]; then
   exit
 fi
 
diff --git a/ci/install.sh b/ci/install.sh
index 98d3dc01cb..4ee99e1e44 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-if [[ -n "${CI_TARGET}" ]]; then
+if [[ "${CI_TARGET}" == lint ]]; then
   exit
 fi
 
-- 
cgit 


From 929c398aab786473e6c28998862cbd1356de0166 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 19:09:18 +0300
Subject: ci: Enable tracing

---
 ci/run_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ci')

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index b552e1f520..92cb5a9fd8 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -8,6 +8,8 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
+set -x
+
 enter_suite tests
 
 check_core_dumps --delete quiet
-- 
cgit 


From 86f5b1276bf444b164ac3a3b60b411afe4bd7ec4 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 19:42:18 +0300
Subject: ci: Add test watchdog and tracing for lint tests

---
 ci/common/suite.sh | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 ci/run_lint.sh     |  4 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index e8c6a2b07a..8c44e5f974 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -54,6 +54,54 @@ run_test() {
   fi
 }
 
+run_test_wd() {
+  local timeout="$1"
+  shift
+  local cmd="$1"
+  shift
+  local test_name="$1"
+  : ${test_name:=$cmd}
+  shift
+  local output_file="$(mktemp)"
+  local status_file="$(mktemp)"
+  local restarts=5
+  local prev_tmpsize=-1
+  while test $restarts -gt 0 ; do
+    : > "${status_file}"
+    (
+      if ! (
+        set -o pipefail
+        eval "$cmd" 2>&1 | tee -a "$output_file"
+      ) ; then
+        fail "${test_name}" "$@"
+      fi
+      echo "$FAILED" > "$status_file"
+    ) &
+    local pid=$!
+    while test "$(stat -c "%s" "$status_file")" -eq 0 ; do
+      prev_tmpsize=$tmpsize
+      sleep $timeout
+      tmpsize="$(stat -c "%s" "$output_file")"
+      if test $tempsize -eq $prev_temsize ; then
+        # no output, assuming either hang or exit
+        break
+      fi
+    done
+    if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
+      # status file not updated, assuming hang
+      kill -KILL $pid
+      echo "Test ${test_name} hang up, restarting"
+    else
+      local new_failed="$(cat "$status_file")"
+      if test "x$new_failed" != "x0" ; then
+        fail "${test_name}" F "Test failed in run_test_wd"
+      fi
+      return 0
+    fi
+    restarts=$[ restarts - 1 ]
+  done
+}
+
 succeeded() {
   return $FAILED
 }
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index c7937930d1..5122ffc2b6 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -10,8 +10,10 @@ source "${CI_DIR}/common/suite.sh"
 
 enter_suite 'lint'
 
+set -x
+
 run_test 'top_make clint-full' clint
 run_test 'top_make testlint' testlint
-run_test 'top_make check-single-includes' single-includes
+run_test_wd 5s 'top_make check-single-includes' single-includes
 
 exit_suite
-- 
cgit 


From 6ddaace7ac9f2ed13d7b210d87c715c9f7209c7f Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 31 Mar 2017 20:52:05 +0300
Subject: ci: Do not shift if there are not enough arguments

---
 ci/common/suite.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 8c44e5f974..a70cafc92c 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -45,10 +45,10 @@ fail() {
 
 run_test() {
   local cmd="$1"
-  shift
+  test $# -gt 0 && shift
   local test_name="$1"
   : ${test_name:=$cmd}
-  shift
+  test $# -gt 0 && shift
   if ! eval "$cmd" ; then
     fail "${test_name}" "$@"
   fi
@@ -56,12 +56,12 @@ run_test() {
 
 run_test_wd() {
   local timeout="$1"
-  shift
+  test $# -gt 0 && shift
   local cmd="$1"
-  shift
+  test $# -gt 0 && shift
   local test_name="$1"
   : ${test_name:=$cmd}
-  shift
+  test $# -gt 0 && shift
   local output_file="$(mktemp)"
   local status_file="$(mktemp)"
   local restarts=5
-- 
cgit 


From ae7d8d8ffb86eefa45d8f59834eb0f088e93535d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 3 Apr 2017 03:47:42 +0300
Subject: ci: Do not mark test as failed if it is previous one which failed

---
 ci/common/suite.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index a70cafc92c..5c79ce2718 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -69,6 +69,7 @@ run_test_wd() {
   while test $restarts -gt 0 ; do
     : > "${status_file}"
     (
+      FAILED=0
       if ! (
         set -o pipefail
         eval "$cmd" 2>&1 | tee -a "$output_file"
-- 
cgit 


From 644db2165e3437be66d11e46624124c99cfb810e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Apr 2017 03:58:10 +0300
Subject: ci: Clean up when restarting single includes test

---
 ci/common/suite.sh | 9 +++++++++
 ci/run_lint.sh     | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 5c79ce2718..44a560c50a 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -57,13 +57,21 @@ run_test() {
 run_test_wd() {
   local timeout="$1"
   test $# -gt 0 && shift
+
   local cmd="$1"
   test $# -gt 0 && shift
+
+  local restart_cmd="$1"
+  : ${restart_cmd:=true}
+  test $# -gt 0 && shift
+
   local test_name="$1"
   : ${test_name:=$cmd}
   test $# -gt 0 && shift
+
   local output_file="$(mktemp)"
   local status_file="$(mktemp)"
+
   local restarts=5
   local prev_tmpsize=-1
   while test $restarts -gt 0 ; do
@@ -92,6 +100,7 @@ run_test_wd() {
       # status file not updated, assuming hang
       kill -KILL $pid
       echo "Test ${test_name} hang up, restarting"
+      eval "$restart_cmd"
     else
       local new_failed="$(cat "$status_file")"
       if test "x$new_failed" != "x0" ; then
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 5122ffc2b6..d2807e425e 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -12,8 +12,13 @@ enter_suite 'lint'
 
 set -x
 
+csi_clean() {
+  rm "${BUILD_DIR}"/bin/test-includes-*
+  find "${BUILD_DIR}" -name '*test-include*.o' -delete
+}
+
 run_test 'top_make clint-full' clint
 run_test 'top_make testlint' testlint
-run_test_wd 5s 'top_make check-single-includes' single-includes
+run_test_wd 5s 'top_make check-single-includes' 'csi_clean' single-includes
 
 exit_suite
-- 
cgit 


From d59378a5cafd3408a1cbecfd8c4de1a96198c81d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Apr 2017 04:02:54 +0300
Subject: ci: Force make output coloring

---
 ci/run_lint.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index d2807e425e..82a8532850 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -19,6 +19,10 @@ csi_clean() {
 
 run_test 'top_make clint-full' clint
 run_test 'top_make testlint' testlint
-run_test_wd 5s 'top_make check-single-includes' 'csi_clean' single-includes
+CLICOLOR_FORCE=1 run_test_wd \
+  5s \
+  'top_make check-single-includes' \
+  'csi_clean' \
+  single-includes
 
 exit_suite
-- 
cgit 


From dcad882256af21bb620f580ff8a112691cd149db Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Apr 2017 04:17:40 +0300
Subject: ci: Do not fail csi_clean if there are no files to remove

---
 ci/run_lint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 82a8532850..39a90102e7 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -13,7 +13,7 @@ enter_suite 'lint'
 set -x
 
 csi_clean() {
-  rm "${BUILD_DIR}"/bin/test-includes-*
+  find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete
   find "${BUILD_DIR}" -name '*test-include*.o' -delete
 }
 
-- 
cgit 


From 017f64b9707955e66319e07e6e8f173b29583235 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Apr 2017 04:59:30 +0300
Subject: ci: Also fail if last restart hang up

---
 ci/common/suite.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 44a560c50a..46207754fa 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -96,11 +96,16 @@ run_test_wd() {
         break
       fi
     done
+    restarts=$[ restarts - 1 ]
     if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
       # status file not updated, assuming hang
       kill -KILL $pid
-      echo "Test ${test_name} hang up, restarting"
-      eval "$restart_cmd"
+      if test $restarts -eq 0 ; then
+        fail "${test_name}" E "Test hang up"
+      else
+        echo "Test ${test_name} hang up, restarting"
+        eval "$restart_cmd"
+      fi
     else
       local new_failed="$(cat "$status_file")"
       if test "x$new_failed" != "x0" ; then
@@ -108,7 +113,6 @@ run_test_wd() {
       fi
       return 0
     fi
-    restarts=$[ restarts - 1 ]
   done
 }
 
-- 
cgit 


From c1416e066534363e35b8895c30d7d7ce90e8b509 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 4 Apr 2017 20:15:30 +0300
Subject: ci: Really continue tests on failure, print global summary

---
 ci/before_cache.sh |  5 ++++-
 ci/common/suite.sh | 58 ++++++++++++++++++++++++++++++++------------------
 ci/common/test.sh  | 62 +++++++++++++++++++++++++++---------------------------
 ci/run_lint.sh     |  2 +-
 ci/run_tests.sh    |  6 +-----
 5 files changed, 75 insertions(+), 58 deletions(-)

(limited to 'ci')

diff --git a/ci/before_cache.sh b/ci/before_cache.sh
index dd1fcf2bf7..3d7cc0ec5a 100755
--- a/ci/before_cache.sh
+++ b/ci/before_cache.sh
@@ -3,12 +3,15 @@
 set -e
 set -o pipefail
 
+CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+source "${CI_DIR}/common/suite.sh"
+
 # Don't cache pip's log and selfcheck.
 rm -rf "${HOME}/.cache/pip/log"
 rm -f "${HOME}/.cache/pip/selfcheck.json"
 
 # Update the third-party dependency cache only if the build was successful.
-if [[ -f "${SUCCESS_MARKER}" ]]; then
+if ended_successfully; then
   rm -rf "${HOME}/.cache/nvim-deps"
   mv "${DEPS_BUILD_DIR}" "${HOME}/.cache/nvim-deps"
   touch "${CACHE_MARKER}"
diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 46207754fa..e22252c985 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -2,11 +2,18 @@
 NL="$(printf '\nE')"
 NL="${NL%E}"
 
-FAILED=0
-
 FAIL_SUMMARY=""
 
+# Test success marker. If END_MARKER file exists, we know that all tests 
+# finished. If FAIL_SUMMARY_FILE exists we know that some tests failed, this 
+# file will contain information about failed tests. Build is considered 
+# successful if tests ended without any of them failing.
+END_MARKER="$BUILD_DIR/.tests_finished"
+FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
+
 enter_suite() {
+  FAILED=0
+  rm -f "${END_MARKER}"
   local suite_name="$1"
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
 }
@@ -19,17 +26,16 @@ exit_suite() {
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
   if test "x$1" != "x--continue" ; then
     exit $FAILED
+  else
+    local saved_failed=$FAILED
+    FAILED=0
+    return $saved_failed
   fi
 }
 
 fail() {
-  local allow_failure=
-  if test "x$1" = "x--allow-failure" ; then
-    shift
-    allow_failure=A
-  fi
   local test_name="$1"
-  local fail_char="$allow_failure$2"
+  local fail_char="$2"
   local message="$3"
 
   : ${fail_char:=F}
@@ -37,10 +43,9 @@ fail() {
 
   local full_msg="$fail_char $NVIM_TEST_CURRENT_SUITE|$test_name :: $message"
   FAIL_SUMMARY="${FAIL_SUMMARY}${NL}${full_msg}"
+  echo "${full_msg}" >> "${FAIL_SUMMARY_FILE}"
   echo "Failed: $full_msg"
-  if test "x$allow_failure" = "x" ; then
-    FAILED=1
-  fi
+  FAILED=1
 }
 
 run_test() {
@@ -77,14 +82,13 @@ run_test_wd() {
   while test $restarts -gt 0 ; do
     : > "${status_file}"
     (
-      FAILED=0
-      if ! (
-        set -o pipefail
-        eval "$cmd" 2>&1 | tee -a "$output_file"
-      ) ; then
-        fail "${test_name}" "$@"
+      set -o pipefail
+      ret=0
+      if ! eval "$cmd" 2>&1 | tee -a "$output_file" ; then
+        ret=1
       fi
-      echo "$FAILED" > "$status_file"
+      echo "$ret" > "$status_file"
+      exit $ret
     ) &
     local pid=$!
     while test "$(stat -c "%s" "$status_file")" -eq 0 ; do
@@ -116,6 +120,20 @@ run_test_wd() {
   done
 }
 
-succeeded() {
-  return $FAILED
+ended_successfully() {
+  if [[ -f "${FAIL_SUMMARY_FILE}" ]]; then
+    echo 'Test failed, complete summary:'
+    cat "${FAIL_SUMMARY_FILE}"
+    return 1
+  fi
+  if ! [[ -f "${END_MARKER}" ]] ; then
+    echo 'ended_successfully called before end marker was touched'
+    return 1
+  fi
+  return 0
+}
+
+end_tests() {
+  touch "${END_MARKER}"
+  ended_successfully
 }
diff --git a/ci/common/test.sh b/ci/common/test.sh
index 4936992cfd..d911d9bc18 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -1,4 +1,5 @@
 source "${CI_DIR}/common/build.sh"
+source "${CI_DIR}/common/suite.sh"
 
 print_core() {
   local app="$1"
@@ -40,10 +41,9 @@ check_core_dumps() {
       print_core "$app" "$core"
     fi
   done
-  if test "$app" = quiet ; then
-    return 0
+  if test "$app" != quiet ; then
+    fail 'cores' E 'Core dumps found'
   fi
-  exit 1
 }
 
 check_logs() {
@@ -62,8 +62,7 @@ check_logs() {
     err=1
   done
   if [[ -n "${err}" ]]; then
-    echo "Runtime errors detected."
-    exit 1
+    fail 'logs' E 'Runtime errors detected.'
   fi
 }
 
@@ -75,50 +74,53 @@ asan_check() {
   check_logs "${1}" "*san.*"
 }
 
-run_unittests() {
+run_unittests() {(
+  enter_suite unittests
   ulimit -c unlimited
   if ! build_make unittest ; then
-    check_core_dumps "$(which luajit)"
-    exit 1
+    fail 'unittests' F 'Unit tests failed'
   fi
   check_core_dumps "$(which luajit)"
-}
+  exit_suite
+)}
 
-run_functionaltests() {
+run_functionaltests() {(
+  enter_suite functionaltests
   ulimit -c unlimited
   if ! build_make ${FUNCTIONALTEST}; then
-    asan_check "${LOG_DIR}"
-    valgrind_check "${LOG_DIR}"
-    check_core_dumps
-    exit 1
+    fail 'functionaltests' F 'Functional tests failed'
   fi
   asan_check "${LOG_DIR}"
   valgrind_check "${LOG_DIR}"
   check_core_dumps
-}
+  exit_suite
+)}
 
-run_oldtests() {
+run_oldtests() {(
+  enter_suite oldtests
   ulimit -c unlimited
   if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
     reset
-    asan_check "${LOG_DIR}"
-    valgrind_check "${LOG_DIR}"
-    check_core_dumps
-    exit 1
+    fail 'oldtests' F 'Legacy tests failed'
   fi
   asan_check "${LOG_DIR}"
   valgrind_check "${LOG_DIR}"
   check_core_dumps
-}
+  exit_suite
+)}
 
-install_nvim() {
-  build_make install
+install_nvim() {(
+  enter_suite 'install_nvim'
+  if ! build_make install ; then
+    fail 'install' E 'make install failed'
+    exit_suite
+  fi
 
   "${INSTALL_PREFIX}/bin/nvim" --version
   "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' || {
     echo "Running ':help' in the installed nvim failed."
     echo "Maybe the helptags have not been generated properly."
-    exit 1
+    fail 'help' F 'Failed running :help'
   }
 
   local genvimsynf=syntax/vim/generated.vim
@@ -127,24 +129,22 @@ install_nvim() {
     cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
   ) ; do
     if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
-      echo "It appears that $file is not installed."
-      exit 1
+      fail 'runtime-install' F "It appears that $file is not installed."
     fi
   done
 
   # Check that generated syntax file has function names, #5060.
   local gpat='syn keyword vimFuncName .*eval'
   if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then
-    echo "It appears that $genvimsynf does not contain $gpat."
-    exit 1
+    fail 'funcnames' F "It appears that $genvimsynf does not contain $gpat."
   fi
 
   for file in $(
     cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
   ) ; do
     if ! test -x "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
-      echo "It appears that $file is not installed or is not executable."
-      exit 1
+      fail 'not-exe' F "It appears that $file is not installed or is not executable."
     fi
   done
-}
+  exit_suite
+)}
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 39a90102e7..2c30615725 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -25,4 +25,4 @@ CLICOLOR_FORCE=1 run_test_wd \
   'csi_clean' \
   single-includes
 
-exit_suite
+end_tests
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 92cb5a9fd8..4abc9eea9f 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -27,8 +27,4 @@ run_test run_oldtests
 
 run_test install_nvim
 
-if succeeded ; then
-  touch "${SUCCESS_MARKER}"
-fi
-
-exit_suite
+end_tests
-- 
cgit 


From 3321232c814f2847e835a6aaaf72b257cb4f6432 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 8 Apr 2017 00:46:32 +0300
Subject: ci: Allow check-single-includes to hang

---
 ci/common/suite.sh | 10 +++++++++-
 ci/run_lint.sh     |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index e22252c985..568d5d5bee 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -60,6 +60,12 @@ run_test() {
 }
 
 run_test_wd() {
+  local hang_ok=
+  if test "x$1" = "x--allow-hang" ; then
+    hang_ok=1
+    shift
+  fi
+
   local timeout="$1"
   test $# -gt 0 && shift
 
@@ -105,7 +111,9 @@ run_test_wd() {
       # status file not updated, assuming hang
       kill -KILL $pid
       if test $restarts -eq 0 ; then
-        fail "${test_name}" E "Test hang up"
+        if test "x$hang_ok" = "x" ; then
+          fail "${test_name}" E "Test hang up"
+        fi
       else
         echo "Test ${test_name} hang up, restarting"
         eval "$restart_cmd"
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 2c30615725..927bcbf6b5 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -20,6 +20,7 @@ csi_clean() {
 run_test 'top_make clint-full' clint
 run_test 'top_make testlint' testlint
 CLICOLOR_FORCE=1 run_test_wd \
+  --allow-hang \
   5s \
   'top_make check-single-includes' \
   'csi_clean' \
-- 
cgit 


From 7c9c4d9da96096f91a47016e981e88133f3fa90e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 8 Apr 2017 00:47:33 +0300
Subject: ci: Increase check-single-includes wait time to 10s

---
 ci/run_lint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 927bcbf6b5..5639b4c3db 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -21,7 +21,7 @@ run_test 'top_make clint-full' clint
 run_test 'top_make testlint' testlint
 CLICOLOR_FORCE=1 run_test_wd \
   --allow-hang \
-  5s \
+  10s \
   'top_make check-single-includes' \
   'csi_clean' \
   single-includes
-- 
cgit 


From 2a8055a8d9b904739bdea0b0a9f5d3e635798d13 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 15:11:27 +0300
Subject: ci: Make appveyor use new output handler as well

---
 ci/build.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ci')

diff --git a/ci/build.bat b/ci/build.bat
index 87a171b994..9071c0864e 100644
--- a/ci/build.bat
+++ b/ci/build.bat
@@ -38,7 +38,7 @@ cd ..
 :: Build Neovim
 mkdir build
 cd build
-cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=gtest -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=nvim -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
 mingw32-make VERBOSE=1 || goto :error
 bin\nvim --version || goto :error
 
-- 
cgit