diff options
Diffstat (limited to 'ci/run_tests.sh')
| -rwxr-xr-x | ci/run_tests.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh index da72d09506..0ef7080628 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -4,8 +4,11 @@ set -e set -o pipefail CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/build.sh" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/test.sh" +# shellcheck source-path=SCRIPTDIR source "${CI_DIR}/common/suite.sh" rm -f "$END_MARKER" @@ -14,16 +17,15 @@ rm -f "$END_MARKER" if (($# == 0)); then tests=('build_nvim') + # Additional threads aren't created in the unit/old 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 tests+=('unittests') fi - tests+=('functionaltests') + tests+=('oldtests') fi - tests+=('oldtests' 'install_nvim') + tests+=('functionaltests' 'install_nvim') else tests=("$@") fi |