2 files changed, 94 insertions, 10 deletions
diff --git a/test/functional/legacy/eval_spec.lua b/test/functional/legacy/eval_spec.lua
index b7317045be..3684fe714d 100644
--- a/test/functional/legacy/eval_spec.lua
+++ b/test/functional/legacy/eval_spec.lua
@@ -5,11 +5,6 @@ local feed, insert, source = helpers.feed, helpers.insert, helpers.source
 local clear, execute, expect = helpers.clear, helpers.execute, helpers.expect
 local eq, eval, write_file = helpers.eq, helpers.eval, helpers.write_file
 
-local function has_clipboard()
-  clear()
-  return 1 == eval("has('clipboard')")
-end
-
 describe('eval', function()
   setup(function()
     write_file('test_eval_setup.vim', [[
@@ -539,8 +534,13 @@ describe('eval', function()
       =: type v; value: abc/]].."\000 (['abc/\000"..[[']), expr: "abc/]]..'\000'..[[" (['"abc/]]..'\000'..[["'])]])
   end)
 
-  if has_clipboard() then
-    it('system clipboard', function()
+  describe('system clipboard', function()
+    before_each(function()
+      execute('let &runtimepath = "test/functional/fixtures,".&runtimepath')
+      execute('call getreg("*")') -- force load of provider
+    end)
+
+    it('works', function()
       insert([[
 	Some first line (this text was at the top of the old test_eval.in).
 	
@@ -570,9 +570,7 @@ describe('eval', function()
 	*: type V; value: clipboard contents]]..'\00'..[[ (['clipboard contents']), expr: clipboard contents]]..'\00'..[[ (['clipboard contents'])
 	*: type V; value: something else]]..'\00'..[[ (['something else']), expr: something else]]..'\00'..[[ (['something else'])]])
     end)
-  else
-    pending('system clipboard not available', function() end)
-  end
+  end)
 
   it('errors', function()
     source([[
diff --git a/test/functional/legacy/getcwd_spec.lua b/test/functional/legacy/getcwd_spec.lua
new file mode 100644
index 0000000000..3bb9930b74
--- /dev/null
+++ b/test/functional/legacy/getcwd_spec.lua
@@ -0,0 +1,86 @@
+-- Tests for getcwd(), haslocaldir(), and :lcd
+
+local helpers = require('test.functional.helpers')(after_each)
+local eq, eval, source = helpers.eq, helpers.eval, helpers.source
+local call, clear, execute = helpers.call, helpers.clear, helpers.execute
+
+describe('getcwd', function()
+  before_each(clear)
+
+  after_each(function()
+    helpers.rmdir('Xtopdir')
+  end)
+
+  it('is working', function()
+    source([[
+      function! GetCwdInfo(win, tab)
+       let tab_changed = 0
+       let mod = ":t"
+       if a:tab > 0 && a:tab != tabpagenr()
+         let tab_changed = 1
+         exec "tabnext " . a:tab
+       endif
+       let bufname = fnamemodify(bufname(winbufnr(a:win)), mod)
+       if tab_changed
+         tabprevious
+       endif
+       if a:win == 0 && a:tab == 0
+         let dirname = fnamemodify(getcwd(), mod)
+         let lflag = haslocaldir()
+       elseif a:tab == 0
+         let dirname = fnamemodify(getcwd(a:win), mod)
+         let lflag = haslocaldir(a:win)
+       else
+         let dirname = fnamemodify(getcwd(a:win, a:tab), mod)
+         let lflag = haslocaldir(a:win, a:tab)
+       endif
+       return bufname . ' ' . dirname . ' ' . lflag
+      endfunction
+    ]])
+    execute('new')
+    execute('let cwd=getcwd()')
+    call('mkdir', 'Xtopdir')
+    execute('silent cd Xtopdir')
+    call('mkdir', 'Xdir1')
+    call('mkdir', 'Xdir2')
+    call('mkdir', 'Xdir3')
+    execute('new a')
+    execute('new b')
+    execute('new c')
+    execute('3wincmd w')
+    execute('silent lcd Xdir1')
+    eq('a Xdir1 1', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    eq('b Xtopdir 0', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir3')
+    eq('c Xdir3 1', eval('GetCwdInfo(0, 0)'))
+    eq('a Xdir1 1', eval('GetCwdInfo(bufwinnr("a"), 0)'))
+    eq('b Xtopdir 0', eval('GetCwdInfo(bufwinnr("b"), 0)'))
+    eq('c Xdir3 1', eval('GetCwdInfo(bufwinnr("c"), 0)'))
+    execute('wincmd W')
+    eq('a Xdir1 1', eval('GetCwdInfo(bufwinnr("a"), tabpagenr())'))
+    eq('b Xtopdir 0', eval('GetCwdInfo(bufwinnr("b"), tabpagenr())'))
+    eq('c Xdir3 1', eval('GetCwdInfo(bufwinnr("c"), tabpagenr())'))
+
+    execute('tabnew x')
+    execute('new y')
+    execute('new z')
+    execute('3wincmd w')
+    eq('x Xtopdir 0', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir2')
+    eq('y Xdir2 1', eval('GetCwdInfo(0, 0)'))
+    execute('wincmd W')
+    execute('silent lcd Xdir3')
+    eq('z Xdir3 1', eval('GetCwdInfo(0, 0)'))
+    eq('x Xtopdir 0', eval('GetCwdInfo(bufwinnr("x"), 0)'))
+    eq('y Xdir2 1', eval('GetCwdInfo(bufwinnr("y"), 0)'))
+    eq('z Xdir3 1', eval('GetCwdInfo(bufwinnr("z"), 0)'))
+    execute('let tp_nr = tabpagenr()')
+    execute('tabrewind')
+    eq('x Xtopdir 0', eval('GetCwdInfo(3, tp_nr)'))
+    eq('y Xdir2 1', eval('GetCwdInfo(2, tp_nr)'))
+    eq('z Xdir3 1', eval('GetCwdInfo(1, tp_nr)'))
+  end)
+end)