diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-10-19 18:04:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-19 18:04:08 -0700 |
| commit | 019c8d13dd7056725c0715dc15e451118b767b7d (patch) | |
| tree | 09b58913672d5a3a3c3f920f45e6ac7d295bed25 /test | |
| parent | 06a6828f01638d7f1fed012b494d93eb5f1c206d (diff) | |
| download | rneovim-019c8d13dd7056725c0715dc15e451118b767b7d.tar.gz rneovim-019c8d13dd7056725c0715dc15e451118b767b7d.tar.bz2 rneovim-019c8d13dd7056725c0715dc15e451118b767b7d.zip | |
build/doc/CI: remove/update quickbuild references #11258
Diffstat (limited to 'test')
| -rw-r--r-- | test/functional/api/server_requests_spec.lua | 4 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 4 | ||||
| -rw-r--r-- | test/helpers.lua | 6 | ||||
| -rw-r--r-- | test/unit/mbyte_spec.lua | 5 |
4 files changed, 3 insertions, 16 deletions
diff --git a/test/functional/api/server_requests_spec.lua b/test/functional/api/server_requests_spec.lua index 61184d2c59..237a4b01e4 100644 --- a/test/functional/api/server_requests_spec.lua +++ b/test/functional/api/server_requests_spec.lua @@ -345,10 +345,6 @@ describe('server -> client', function() describe('connecting to its own pipe address', function() it('does not deadlock', function() - if not helpers.isCI('travis') and helpers.is_os('mac') then - -- It does, in fact, deadlock on QuickBuild. #6851 - pending("deadlocks on QuickBuild") - end local address = funcs.serverlist()[1] local first = string.sub(address,1,1) ok(first == '/' or first == '\\') diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index a6ff10c0a4..1108fbb2ba 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -29,10 +29,8 @@ local module = { } local start_dir = lfs.currentdir() --- XXX: NVIM_PROG takes precedence, QuickBuild sets it. module.nvim_prog = ( - os.getenv('NVIM_PROG') - or os.getenv('NVIM_PRG') + os.getenv('NVIM_PRG') or global_helpers.test_build_dir .. '/bin/nvim' ) -- Default settings for the test session. diff --git a/test/helpers.lua b/test/helpers.lua index 30e43a9ea4..4c526d217f 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -715,13 +715,11 @@ end function module.isCI(name) local any = (name == nil) - assert(any or name == 'appveyor' or name == 'quickbuild' or name == 'travis' - or name == 'sourcehut') + assert(any or name == 'appveyor' or name == 'travis' or name == 'sourcehut') 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')) local sh = ((any or name == 'sourcehut') and nil ~= os.getenv('SOURCEHUT')) - return tr or av or qb or sh + return tr or av or sh end diff --git a/test/unit/mbyte_spec.lua b/test/unit/mbyte_spec.lua index d27f52923a..fdb1bceab0 100644 --- a/test/unit/mbyte_spec.lua +++ b/test/unit/mbyte_spec.lua @@ -8,11 +8,6 @@ local mbyte = helpers.cimport("./src/nvim/mbyte.h") local charset = helpers.cimport('./src/nvim/charset.h') describe('mbyte', function() - if helpers.isCI('quickbuild') then - pending("crashes on quickbuild", function() end) - return - end - -- Array for composing characters local intp = ffi.typeof('int[?]') local function to_intp() |