commit 3d49d39cd8a322b201d0b72ff5372f871e1b93d2 parent 80a02d1cef9bd4880e5952d3d0328dac5c7457ad Author: zeertzjq <zeertzjq@outlook.com> Date: Wed, 11 Jan 2023 21:36:26 +0800 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. Diffstat:
| M | .github/workflows/ci.yml | | | 4 | ++-- |
| M | ci/run_tests.sh | | | 7 | +++---- |
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git 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 @@ -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