diff options
| -rw-r--r-- | .github/workflows/ci.yml | 3 | ||||
| -rwxr-xr-x | .github/workflows/env.sh | 2 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 10 |
3 files changed, 6 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16464426ee..b3949578c1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -167,11 +167,12 @@ jobs: runner: macos-11.0 os: osx - # The functionaltest-lua test two things simultaneously: + # functionaltest-lua is our dumping ground for non-mainline configurations. # 1. Check that the tests pass with PUC Lua instead of LuaJIT. # 2. Use as oldest/minimum versions of dependencies/build tools we # still explicitly support so we don't accidentally rely on # features that is only available on later versions. + # 3. No treesitter parsers installed. - flavor: functionaltest-lua cc: gcc runner: ubuntu-20.04 diff --git a/.github/workflows/env.sh b/.github/workflows/env.sh index c3959ac104..03f4a10211 100755 --- a/.github/workflows/env.sh +++ b/.github/workflows/env.sh @@ -64,7 +64,7 @@ EOF functionaltest-lua) BUILD_FLAGS="$BUILD_FLAGS -DPREFER_LUA=ON" FUNCTIONALTEST=functionaltest-lua - DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF" + DEPS_CMAKE_FLAGS="$DEPS_CMAKE_FLAGS -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_TS_PARSERS=OFF" ;; *) ;; diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 3d64625752..7c923351ab 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -720,14 +720,10 @@ function module.pending_win32(pending_fn) end function module.pending_c_parser(pending_fn) - local status, msg = unpack(module.exec_lua([[ return {pcall(vim.treesitter.require_language, 'c')} ]])) + local status, _ = unpack(module.exec_lua([[ return {pcall(vim.treesitter.require_language, 'c')} ]])) if not status then - if module.isCI() then - error("treesitter C parser not found, required on CI: " .. msg) - else - pending_fn 'no C parser, skipping' - return true - end + pending_fn 'no C parser, skipping' + return true end return false end |