Merge pull request #10186 from blueyed/fix-cd

ci: minor improvements

3 files changed, 8 insertions, 5 deletions

diff --git a/ci/before_script.sh b/ci/before_script.sh
index 49b4e068b5..ae20eef1fc 100755
--- a/ci/before_script.sh
+++ b/ci/before_script.sh
@@ -20,8 +20,8 @@ if [[ -n "${LLVM_SYMBOLIZER}" ]] && [[ ! $(type -P "${LLVM_SYMBOLIZER}") ]]; the
   exit 1
 fi
 
-# Show ccache stats so we can compare in before_cache
-ccache -s 2>/dev/null || true
+# Reset ccache stats for real results in before_cache.
+ccache --zero-stats
 
 if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
   # Adds user to a dummy group.
diff --git a/ci/build.ps1 b/ci/build.ps1
index 151563709c..d3686e2914 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -129,6 +129,8 @@ if ($uploadToCodecov) {
 }
 
 # Old tests
+# Add MSYS to path, required for e.g. `find` used in test scripts.
+# But would break functionaltests, where its `more` would be used then.
 $env:PATH = "C:\msys64\usr\bin;$env:PATH"
 & "C:\msys64\mingw$bits\bin\mingw32-make.exe" -C $(Convert-Path ..\src\nvim\testdir) VERBOSE=1
 
diff --git a/ci/common/test.sh b/ci/common/test.sh
index 18b5639885..0912c3965f 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -32,11 +32,12 @@ check_core_dumps() {
     shift
   fi
   local app="${1:-${BUILD_DIR}/bin/nvim}"
+  local cores
   if test "${TRAVIS_OS_NAME}" = osx ; then
-    local cores="$(find /cores/ -type f -print)"
+    cores="$(find /cores/ -type f -print)"
     local _sudo='sudo'
   else
-    local cores="$(find ./ -type f -name 'core.*' -print)"
+    cores="$(find ./ -type f -name 'core.*' -print)"
     local _sudo=
   fi
 
@@ -94,7 +95,7 @@ run_unittests() {(
     fail 'unittests' F 'Unit tests failed'
   fi
   submit_coverage unittest
-  check_core_dumps "$(which luajit)"
+  check_core_dumps "$(command -v luajit)"
   exit_suite
 )}