diff options
| -rw-r--r-- | test/functional/helpers.lua | 32 | ||||
| -rw-r--r-- | test/functional/legacy/105_filename_modifiers_spec.lua | 6 |
2 files changed, 25 insertions, 13 deletions
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua index 4a98056104..27d8493a12 100644 --- a/test/functional/helpers.lua +++ b/test/functional/helpers.lua @@ -6,23 +6,33 @@ local Session = require('nvim.session') local nvim_prog = os.getenv('NVIM_PROG') or 'build/bin/nvim' local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N', '--embed'} +local prepend_argv if os.getenv('VALGRIND') then local log_file = os.getenv('VALGRIND_LOG') or 'valgrind-%p.log' - local valgrind_argv = {'valgrind', '-q', '--tool=memcheck', - '--leak-check=yes', '--track-origins=yes', - '--show-possibly-lost=no', - '--suppressions=.valgrind.supp', - '--log-file='..log_file} - if os.getenv('VALGRIND_GDB') then - table.insert(valgrind_argv, '--vgdb=yes') - table.insert(valgrind_argv, '--vgdb-error=0') + prepend_argv = {'valgrind', '-q', '--tool=memcheck', + '--leak-check=yes', '--track-origins=yes', + '--show-possibly-lost=no', + '--suppressions=.valgrind.supp', + '--log-file='..log_file} + if os.getenv('GDB') then + table.insert(prepend_argv, '--vgdb=yes') + table.insert(prepend_argv, '--vgdb-error=0') end - local len = #valgrind_argv +elseif os.getenv('GDB') then + local gdbserver_port = '7777' + if os.getenv('GDBSERVER_PORT') then + gdbserver_port = os.getenv('GDBSERVER_PORT') + end + prepend_argv = {'gdbserver', 'localhost:'..gdbserver_port} +end + +if prepend_argv then + local len = #prepend_argv for i = 1, #nvim_argv do - valgrind_argv[i + len] = nvim_argv[i] + prepend_argv[i + len] = nvim_argv[i] end - nvim_argv = valgrind_argv + nvim_argv = prepend_argv end local session, loop_running, loop_stopped, last_error diff --git a/test/functional/legacy/105_filename_modifiers_spec.lua b/test/functional/legacy/105_filename_modifiers_spec.lua index 32fa6ac7eb..3b417a88eb 100644 --- a/test/functional/legacy/105_filename_modifiers_spec.lua +++ b/test/functional/legacy/105_filename_modifiers_spec.lua @@ -8,7 +8,9 @@ describe('filename modifiers', function() setup(clear) it('is working', function() - execute('cd /tmp') + local tmpdir = helpers.nvim('eval', 'resolve("/tmp")') + + execute('cd ' .. tmpdir) execute([=[set shell=sh]=]) execute([=[set shellslash]=]) execute([=[let tab="\t"]=]) @@ -62,7 +64,7 @@ describe('filename modifiers', function() fnamemodify('abc.fb2.tar.gz', ':r' ) 'abc.fb2.tar' fnamemodify('abc.fb2.tar.gz', ':r:r' ) 'abc.fb2' fnamemodify('abc.fb2.tar.gz', ':r:r:r' ) 'abc' - substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') '/tmp/abc.fb2' + substitute(fnamemodify('abc.fb2.tar.gz', ':p:r:r'), '.*\(nvim/testdir/.*\)', '\1', '') ']=] .. tmpdir .. [=[/abc.fb2' fnamemodify('abc.fb2.tar.gz', ':e' ) 'gz' fnamemodify('abc.fb2.tar.gz', ':e:e' ) 'tar.gz' fnamemodify('abc.fb2.tar.gz', ':e:e:e' ) 'fb2.tar.gz' |