diff options
| -rwxr-xr-x | ci/run_tests.sh | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh index e18c259205..1baeb090a8 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -3,25 +3,22 @@ set -e set -o pipefail -run_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_suite run_unittests unittests - fi - run_suite run_functionaltests functionaltests - fi - run_suite run_oldtests oldtests - run_suite install_nvim install_nvim -} - 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" run_suite 'build_nvim' 'build' -run_suite 'run_tests' '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_suite run_unittests unittests + fi + run_suite run_functionaltests functionaltests +fi +run_suite run_oldtests oldtests +run_suite install_nvim install_nvim end_tests |