1 files changed, 6 insertions, 115 deletions

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 038b116c5a..561849ce2d 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -11,22 +11,10 @@ FAIL_SUMMARY=""
 END_MARKER="$BUILD_DIR/.tests_finished"
 FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
 
-ANSI_CLEAR="\033[0K"
-
-if test "$TRAVIS" = "true"; then
-  ci_fold() {
-    local action="$1"
-    local name="$2"
-    name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\{1,\}/-/g')"
-    name="$(echo -n "$name" | sed 's/-$//')"
-    echo -en "travis_fold:${action}:${name}\r${ANSI_CLEAR}"
-  }
-elif test "$GITHUB_ACTIONS" = "true"; then
-  ci_fold() {
+ci_fold() {
+  if test "$GITHUB_ACTIONS" = "true"; then
     local action="$1"
     local name="$2"
-    name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\{1,\}/-/g')"
-    name="$(echo -n "$name" | sed 's/-$//')"
     case "$action" in
       start)
         echo "::group::${name}"
@@ -37,12 +25,8 @@ elif test "$GITHUB_ACTIONS" = "true"; then
       *)
         :;;
     esac
-  }
-else
-  ci_fold() {
-    return 0
-  }
-fi
+  fi
+}
 
 enter_suite() {
   set +x
@@ -50,7 +34,7 @@ enter_suite() {
   rm -f "${END_MARKER}"
   local suite_name="$1"
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
-  ci_fold start "${NVIM_TEST_CURRENT_SUITE}"
+  ci_fold "start" "$suite_name"
   set -x
 }
 
@@ -60,7 +44,7 @@ exit_suite() {
     echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
     echo "${FAIL_SUMMARY}"
   else
-    ci_fold end "${NVIM_TEST_CURRENT_SUITE}"
+    ci_fold "end" ""
   fi
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
   if test "$1" != "--continue" ; then
@@ -98,99 +82,6 @@ run_test() {
   fi
 }
 
-run_test_wd() {
-  local hang_ok=
-  if test "$1" = "--allow-hang" ; then
-    hang_ok=1
-    shift
-  fi
-
-  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 sid_file="$(mktemp)"
-
-  local restarts=5
-  local prev_tmpsize=-1
-  while test $restarts -gt 0 ; do
-    : > "$status_file"
-    : > "$sid_file"
-    setsid \
-      env \
-        output_file="$output_file" \
-        status_file="$status_file" \
-        sid_file="$sid_file" \
-        cmd="$cmd" \
-        CI_DIR="$CI_DIR" \
-        sh -c '
-          . "${CI_DIR}/common/test.sh"
-          ps -o sid= > "$sid_file"
-          (
-            ret=0
-            if ! eval "$cmd" 2>&1 ; then
-              ret=1
-            fi
-            echo "$ret" > "$status_file"
-          ) | tee -a "$output_file"
-        '
-    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
-    restarts=$(( restarts - 1 ))
-    if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
-      # Status file not updated, assuming hang
-
-      # SID not known, this should not ever happen
-      if test "$(stat -c "%s" "$sid_file")" -eq 0 ; then
-        fail "$test_name" E "Shell did not run"
-        break
-      fi
-
-      # Kill all processes which belong to one session: should get rid of test
-      # processes as well as sh itself.
-      pkill -KILL -s$(cat "$sid_file")
-
-      if test $restarts -eq 0 ; then
-        if test -z "$hang_ok" ; then
-          fail "$test_name" E "Test hang up"
-        fi
-      else
-        echo "Test ${test_name} hang up, restarting"
-        eval "$restart_cmd"
-      fi
-    else
-      local new_failed="$(cat "$status_file")"
-      if test "$new_failed" != "0" ; then
-        fail "$test_name" F "Test failed in run_test_wd"
-      fi
-      break
-    fi
-  done
-
-  rm -f "$output_file"
-  rm -f "$status_file"
-  rm -f "$sid_file"
-}
-
 ended_successfully() {
   if test -f "${FAIL_SUMMARY_FILE}" ; then
     echo 'Test failed, complete summary:'