summaryrefslogtreecommitdiffstatshomepage
path: root/test
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2026-04-22 18:25:07 -0400
committerGitHub <noreply@github.com>2026-04-22 18:25:07 -0400
commit82198d0a6622c750b0b86b721998b00ccf3e2b23 (patch)
treeca0d2583127cb48ab3d4146cecd640eef2def66c /test
parent451811b1be6236fdf69bd41f985d10bdfbcc5f0b (diff)
ci: drop cirrus #39321
Problem: cirrus will shutdown soon, and we are running out of minutes anyway, which causes ci failures. Solution: Drop cirrus config.
Diffstat (limited to 'test')
-rw-r--r--test/CMakeLists.txt1
-rw-r--r--test/functional/core/fileio_spec.lua6
-rw-r--r--test/functional/ex_cmds/write_spec.lua3
-rw-r--r--test/functional/plugin/man_spec.lua3
-rw-r--r--test/functional/terminal/ex_terminal_spec.lua3
-rw-r--r--test/harness.lua9
-rw-r--r--test/testutil.lua2
7 files changed, 6 insertions, 21 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cb367b9330..b186ffc6d6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,6 @@ get_directory_property(TEST_INCLUDE_DIRS DIRECTORY ${PROJECT_SOURCE_DIR}/src/nvi
set(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(TEST_OPTIONS
-D BUILD_DIR=${CMAKE_BINARY_DIR}
- -D CIRRUS_CI=$ENV{CIRRUS_CI}
-D CI_BUILD=${CI_BUILD}
-D NVIM_PRG=$<TARGET_FILE:nvim_bin>
-D TEST_DIR=${TEST_DIR}
diff --git a/test/functional/core/fileio_spec.lua b/test/functional/core/fileio_spec.lua
index b1a8e21762..cd23e00b03 100644
--- a/test/functional/core/fileio_spec.lua
+++ b/test/functional/core/fileio_spec.lua
@@ -30,7 +30,6 @@ local write_file = t.write_file
local feed_command = n.feed_command
local skip = t.skip
local is_os = t.is_os
-local is_ci = t.is_ci
local set_session = n.set_session
describe('fileio', function()
@@ -125,7 +124,6 @@ describe('fileio', function()
end)
it('backup #9709', function()
- skip(is_ci('cirrus'))
clear({
args = {
'-i',
@@ -151,7 +149,6 @@ describe('fileio', function()
end)
it('backup with full path #11214', function()
- skip(is_ci('cirrus'))
clear()
mkdir('Xtest_backupdir')
command('set backup')
@@ -176,7 +173,6 @@ describe('fileio', function()
end)
it('backup with full path with spaces', function()
- skip(is_ci('cirrus'))
clear()
mkdir('Xtest_backupdir with spaces')
command('set backup')
@@ -201,7 +197,6 @@ describe('fileio', function()
end)
it('backup symlinked files #11349', function()
- skip(is_ci('cirrus'))
clear()
local initial_content = 'foo'
@@ -222,7 +217,6 @@ describe('fileio', function()
end)
it('backup symlinked files in first available backupdir #11349', function()
- skip(is_ci('cirrus'))
clear()
local initial_content = 'foo'
diff --git a/test/functional/ex_cmds/write_spec.lua b/test/functional/ex_cmds/write_spec.lua
index 38cc85fdb6..4ba3952d7e 100644
--- a/test/functional/ex_cmds/write_spec.lua
+++ b/test/functional/ex_cmds/write_spec.lua
@@ -10,7 +10,6 @@ local fn = n.fn
local api = n.api
local skip = t.skip
local is_os = t.is_os
-local is_ci = t.is_ci
local read_file = t.read_file
local fname = 'Xtest-functional-ex_cmds-write'
@@ -56,7 +55,6 @@ describe(':write', function()
end)
it('&backupcopy=no replaces symlink with new file', function()
- skip(is_ci('cirrus'))
command('set backupcopy=no')
write_file('Xtest_bkc_file.txt', 'content0')
if is_os('win') then
@@ -148,7 +146,6 @@ describe(':write', function()
end)
it('errors out correctly', function()
- skip(is_ci('cirrus'))
command('let $HOME=""')
eq(fn.fnamemodify('.', ':p:h'), fn.fnamemodify('.', ':p:h:~'))
-- Message from check_overwrite
diff --git a/test/functional/plugin/man_spec.lua b/test/functional/plugin/man_spec.lua
index c3fec441a9..ec86362dfb 100644
--- a/test/functional/plugin/man_spec.lua
+++ b/test/functional/plugin/man_spec.lua
@@ -12,8 +12,6 @@ local matches = t.matches
local tmpname = t.tmpname
local eq = t.eq
local pesc = vim.pesc
-local skip = t.skip
-local is_ci = t.is_ci
-- Collects all names passed to find_path() after attempting ":Man foo".
local function get_search_history(name)
@@ -247,7 +245,6 @@ describe(':Man', function()
end)
it('reports non-existent man pages for absolute paths', function()
- skip(is_ci('cirrus'))
local actual_file = tmpname()
-- actual_file must be an absolute path to an existent file for us to test against it
matches('^/.+', actual_file)
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index bb56a52fd6..d6ecd816e1 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -16,7 +16,6 @@ local ok = t.ok
local command = n.command
local skip = t.skip
local is_os = t.is_os
-local is_ci = t.is_ci
describe(':terminal', function()
local screen
@@ -52,7 +51,7 @@ describe(':terminal', function()
end)
it('reads output buffer on terminal reporting #4151', function()
- skip(is_ci('cirrus') or is_os('win'))
+ skip(is_os('win'))
if is_os('win') then
command(
[[terminal powershell -NoProfile -NoLogo -Command Write-Host -NoNewline "\"$([char]27)[6n\""; Start-Sleep -Milliseconds 500 ]]
diff --git a/test/harness.lua b/test/harness.lua
index 14fa82ea10..4005e7ba56 100644
--- a/test/harness.lua
+++ b/test/harness.lua
@@ -131,7 +131,7 @@ local uv = vim.uv
--- Public test harness module surface.
--- @class test.harness
---- @field is_ci fun(name?: 'cirrus'|'github'): boolean
+--- @field is_ci fun(name?: 'github'): boolean
--- @field on_suite_end fun(callback: fun()): fun()
--- @field read_nvim_log fun(logfile?: string, ci_rename?: boolean): string?
local M = {}
@@ -151,14 +151,13 @@ local function now_seconds()
end
--- Check whether the harness is running in CI, optionally for one provider.
---- @param name? 'cirrus'|'github'
+--- @param name? 'github'
--- @return boolean
function M.is_ci(name)
local any_provider = (name == nil)
- assert(any_provider or name == 'github' or name == 'cirrus')
+ assert(any_provider or name == 'github')
local github_actions = ((any_provider or name == 'github') and nil ~= os.getenv('GITHUB_ACTIONS'))
- local cirrus_ci = ((any_provider or name == 'cirrus') and nil ~= os.getenv('CIRRUS_CI'))
- return github_actions or cirrus_ci
+ return github_actions
end
--- Read the last `keep` lines from a file.
diff --git a/test/testutil.lua b/test/testutil.lua
index b12f5827da..6745613ac1 100644
--- a/test/testutil.lua
+++ b/test/testutil.lua
@@ -790,7 +790,7 @@ function M.write_file(name, text, no_dedent, append)
file:close()
end
---- @param name? 'cirrus'|'github'
+--- @param name? 'github'
--- @return boolean
function M.is_ci(name)
return harness.is_ci(name)