diff options
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/core/job_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ex_cmds/ctrl_c_spec.lua | 2 | ||||
| -rw-r--r-- | test/functional/ui/output_spec.lua | 2 | ||||
| -rw-r--r-- | test/helpers.lua | 12 |
5 files changed, 12 insertions, 10 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 07218f11dd..dbe9f20412 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -181,7 +181,7 @@ describe('server -> client', function() end) describe('recursive (child) nvim client', function() - if os.getenv("TRAVIS") and helpers.os_name() == "osx" then + if helpers.isCI('travis') and helpers.os_name() == 'osx' then -- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86. pending("[Hangs on Travis macOS. #5002]", function() end) return @@ -340,7 +340,7 @@ describe('server -> client', function() describe('connecting to its own pipe address', function() it('does not deadlock', function() - if not os.getenv("TRAVIS") and helpers.os_name() == "osx" then + if not helpers.isCI('travis') and helpers.os_name() == 'osx' then -- It does, in fact, deadlock on QuickBuild. #6851 pending("deadlocks on QuickBuild", function() end) return diff --git a/test/functional/core/job_spec.lua b/test/functional/core/job_spec.lua index 2b00327f14..212b76b5d9 100644 --- a/test/functional/core/job_spec.lua +++ b/test/functional/core/job_spec.lua @@ -205,7 +205,7 @@ describe('jobs', function() end) it("will not buffer data if it doesn't end in newlines", function() - if os.getenv("TRAVIS") and os.getenv("CC") == "gcc-4.9" + if helpers.isCI('travis') and os.getenv('CC') == 'gcc-4.9' and helpers.os_name() == "osx" then -- XXX: Hangs Travis macOS since e9061117a5b8f195c3f26a5cb94e18ddd7752d86. pending("[Hangs on Travis macOS. #5002]", function() end) diff --git a/test/functional/ex_cmds/ctrl_c_spec.lua b/test/functional/ex_cmds/ctrl_c_spec.lua index 4c5383b712..f65d9f0d01 100644 --- a/test/functional/ex_cmds/ctrl_c_spec.lua +++ b/test/functional/ex_cmds/ctrl_c_spec.lua @@ -11,7 +11,7 @@ describe("CTRL-C (mapped)", function() it("interrupts :global", function() -- Crashes luajit. if helpers.skip_fragile(pending, - os.getenv("TRAVIS") or os.getenv("APPVEYOR")) then + helpers.isCI('travis') or helpers.isCI('appveyor')) then return end diff --git a/test/functional/ui/output_spec.lua b/test/functional/ui/output_spec.lua index 38c4527a5b..9a30ea73c4 100644 --- a/test/functional/ui/output_spec.lua +++ b/test/functional/ui/output_spec.lua @@ -52,7 +52,7 @@ describe("shell command :!", function() it("throttles shell-command output greater than ~10KB", function() if helpers.skip_fragile(pending, - (os.getenv("TRAVIS") and helpers.os_name() == "osx")) then + (helpers.isCI('travis') and helpers.os_name() == 'osx')) then return end child_session.feed_data( diff --git a/test/helpers.lua b/test/helpers.lua index 5739b42fe6..e14bcff2c8 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -674,11 +674,13 @@ function module.write_file(name, text, no_dedent, append) file:close() end -function module.isCI() - local is_travis = nil ~= os.getenv('TRAVIS') - local is_appveyor = nil ~= os.getenv('APPVEYOR') - local is_quickbuild = nil ~= lfs.attributes('/usr/home/quickbuild') - return is_travis or is_appveyor or is_quickbuild +function module.isCI(name) + local any = (name == nil) + assert(any or name == 'appveyor' or name == 'quickbuild' or name == 'travis') + local av = ((any or name == 'appveyor') and nil ~= os.getenv('APPVEYOR')) + local tr = ((any or name == 'travis') and nil ~= os.getenv('TRAVIS')) + local qb = ((any or name == 'quickbuild') and nil ~= lfs.attributes('/usr/home/quickbuild')) + return tr or av or qb end -- Gets the contents of $NVIM_LOG_FILE for printing to the build log. |