1 files changed, 35 insertions, 26 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index d91ac5589e..ae85246ab6 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -8,33 +8,42 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
-enter_suite build
 
-check_core_dumps --delete quiet
+if [[ "$GITHUB_ACTIONS" != "true" ]]; then
+  run_suite 'build_nvim' 'build'
 
-prepare_build
-build_nvim
-
-exit_suite --continue
-
-source ~/.nvm/nvm.sh
-nvm use 10
-
-
-enter_suite tests
-
-if test "$CLANG_SANITIZER" != "TSAN" ; then
-  # Additional threads are only created when the builtin UI starts, which
-  # doesn't happen in the unit/functional tests
-  if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
-    run_test run_unittests
+  if test "$CLANG_SANITIZER" != "TSAN"; then
+    # Additional threads are only created when the builtin UI starts, which
+    # doesn't happen in the unit/functional tests
+    if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
+      run_suite run_unittests unittests
+    fi
+    run_suite run_functionaltests functionaltests
   fi
-  run_test run_functionaltests
+  run_suite run_oldtests oldtests
+  run_suite install_nvim install_nvim
+
+  end_tests
+else
+  case "$1" in
+    build)
+      run_suite 'build_nvim' 'build'
+      ;;
+    unittests)
+      run_suite 'run_unittests' 'unittests'
+      ;;
+    functionaltests)
+      run_suite 'run_functionaltests' 'functionaltests'
+      ;;
+    oldtests)
+      run_suite 'run_oldtests' 'oldtests'
+      ;;
+    install_nvim)
+      run_suite 'install_nvim' 'install_nvim'
+      ;;
+    *)
+      :;;
+  esac
+
+  end_tests
 fi
-run_test run_oldtests
-
-run_test install_nvim
-
-exit_suite --continue
-
-end_tests