diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-01-11 21:36:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-11 14:36:26 +0100 |
| commit | 3d49d39cd8a322b201d0b72ff5372f871e1b93d2 (patch) | |
| tree | 2a7010e6c3568951cc7b24cc3772ac2586a714f6 | |
| parent | 80a02d1cef9bd4880e5952d3d0328dac5c7457ad (diff) | |
| download | rneovim-3d49d39cd8a322b201d0b72ff5372f871e1b93d2.tar.gz rneovim-3d49d39cd8a322b201d0b72ff5372f871e1b93d2.tar.bz2 rneovim-3d49d39cd8a322b201d0b72ff5372f871e1b93d2.zip | |
ci(tsan): run functionaltests instead of oldtests (#21744)
With TUI as an external process oldtests no longer involve threads, so
TSAN isn't useful. Meanwhile functionaltests may involve threads.
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rwxr-xr-x | ci/run_tests.sh | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e727448b9..48338527f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -261,11 +261,11 @@ jobs: name: Unittests run: ./ci/run_tests.sh unittests - - if: matrix.flavor != 'tsan' && (success() || failure() && steps.abort_job.outputs.status == 'success') + - if: success() || failure() && steps.abort_job.outputs.status == 'success' name: Functionaltests run: ./ci/run_tests.sh functionaltests - - if: success() || failure() && steps.abort_job.outputs.status == 'success' + - if: matrix.flavor != 'tsan' && (success() || failure() && steps.abort_job.outputs.status == 'success') name: Oldtests run: ./ci/run_tests.sh oldtests diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 20d758fd6d..0ef7080628 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -17,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 |