diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/cmakeconfig/paths.lua.in (renamed from test/config/paths.lua.in) | 0 | ||||
| -rw-r--r-- | test/functional/core/startup_spec.lua | 6 | ||||
| -rw-r--r-- | test/functional/ex_cmds/sign_spec.lua | 9 | ||||
| -rw-r--r-- | test/functional/shada/shada_spec.lua | 2 | ||||
| -rw-r--r-- | test/helpers.lua | 2 | ||||
| -rwxr-xr-x | test/symbolic/klee/run.sh | 2 | ||||
| -rw-r--r-- | test/unit/helpers.lua | 2 |
7 files changed, 15 insertions, 8 deletions
diff --git a/test/config/paths.lua.in b/test/cmakeconfig/paths.lua.in index e3979981ba..e3979981ba 100644 --- a/test/config/paths.lua.in +++ b/test/cmakeconfig/paths.lua.in diff --git a/test/functional/core/startup_spec.lua b/test/functional/core/startup_spec.lua index 919b7b3f9a..5ba80a3646 100644 --- a/test/functional/core/startup_spec.lua +++ b/test/functional/core/startup_spec.lua @@ -499,11 +499,11 @@ describe('sysinit', function() [[" -u NONE -i NONE --cmd "set noruler" -D')]]) screen:expect([[ ^ | - | Entering Debug mode. Type "cont" to continue. | - cmd: augroup nvim_terminal | + pre-vimrc command line | + cmd: set noruler | > | - <" -u NONE -i NONE --cmd "set noruler" -D 1,0-1 All| + <" -u NONE -i NONE --cmd "set noruler" -D 1,1 All| | ]]) command([[call chansend(g:id, "cont\n")]]) diff --git a/test/functional/ex_cmds/sign_spec.lua b/test/functional/ex_cmds/sign_spec.lua index 891cfe1670..f280a45174 100644 --- a/test/functional/ex_cmds/sign_spec.lua +++ b/test/functional/ex_cmds/sign_spec.lua @@ -1,5 +1,5 @@ local helpers = require('test.functional.helpers')(after_each) -local clear, nvim, eq = helpers.clear, helpers.nvim, helpers.eq +local clear, nvim, eq, assert_alive = helpers.clear, helpers.nvim, helpers.eq, helpers.assert_alive describe('sign', function() before_each(clear) @@ -21,4 +21,11 @@ describe('sign', function() end) end) end) + + describe('define {id}', function() + it ('does not leak memory when specifying multiple times the same argument', function() + nvim('command', 'sign define Foo culhl=Normal culhl=Normal') + assert_alive() + end) + end) end) diff --git a/test/functional/shada/shada_spec.lua b/test/functional/shada/shada_spec.lua index ff63aed235..d10a2facbb 100644 --- a/test/functional/shada/shada_spec.lua +++ b/test/functional/shada/shada_spec.lua @@ -7,7 +7,7 @@ local write_file, spawn, set_session, nvim_prog, exc_exec = helpers.exc_exec local lfs = require('lfs') -local paths = require('test.config.paths') +local paths = require('test.cmakeconfig.paths') local mpack = require('mpack') diff --git a/test/helpers.lua b/test/helpers.lua index a1c3dfacd2..9a77ca1956 100644 --- a/test/helpers.lua +++ b/test/helpers.lua @@ -4,7 +4,7 @@ local assert = require('luassert') local luv = require('luv') local lfs = require('lfs') local relpath = require('pl.path').relpath -local Paths = require('test.config.paths') +local Paths = require('test.cmakeconfig.paths') assert:set_parameter('TableFormatLevel', 100) diff --git a/test/symbolic/klee/run.sh b/test/symbolic/klee/run.sh index 0234a935b5..97ce42c31b 100755 --- a/test/symbolic/klee/run.sh +++ b/test/symbolic/klee/run.sh @@ -54,7 +54,7 @@ main() { includes="$includes -I$PROJECT_SOURCE_DIR/src" includes="$includes -I$PROJECT_BINARY_DIR/src/nvim/auto" includes="$includes -I$PROJECT_BINARY_DIR/include" - includes="$includes -I$PROJECT_BINARY_DIR/config" + includes="$includes -I$PROJECT_BINARY_DIR/cmake.config" includes="$includes -I/host-includes" local defines= diff --git a/test/unit/helpers.lua b/test/unit/helpers.lua index 4dbcaa5347..29ea0235be 100644 --- a/test/unit/helpers.lua +++ b/test/unit/helpers.lua @@ -2,7 +2,7 @@ local ffi = require('ffi') local formatc = require('test.unit.formatc') local Set = require('test.unit.set') local Preprocess = require('test.unit.preprocess') -local Paths = require('test.config.paths') +local Paths = require('test.cmakeconfig.paths') local global_helpers = require('test.helpers') local assert = require('luassert') local say = require('say') |