From 534abe4aafc2fb75a100c6193a8fdf5bfa0838dc Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 11 Jan 2018 17:31:29 -0500 Subject: test: win: get current network drive via io.popen --- test/functional/eval/fnamemodify_spec.lua | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/test/functional/eval/fnamemodify_spec.lua b/test/functional/eval/fnamemodify_spec.lua index f3705d6c99..21e670c41c 100644 --- a/test/functional/eval/fnamemodify_spec.lua +++ b/test/functional/eval/fnamemodify_spec.lua @@ -9,16 +9,22 @@ describe('fnamemodify()', function() before_each(clear) it('works', function() + local drive_f = io.popen('cd', 'r') + local drive = string.gsub(drive_f:read('*a'), '[\n\r]', '') + drive_f:close() + if iswin() then - eq([[C:\]], fnamemodify([[\]], ':p:h')) - eq([[C:\]], fnamemodify([[\]], ':p')) - eq([[C:\]], fnamemodify([[/]], ':p:h')) - eq([[C:\]], fnamemodify([[/]], ':p')) + local root = drive..[[\]] + eq(root, fnamemodify([[\]], ':p:h')) + eq(root, fnamemodify([[\]], ':p')) + eq(root, fnamemodify([[/]], ':p:h')) + eq(root, fnamemodify([[/]], ':p')) command('set shellslash') - eq([[C:/]], fnamemodify([[\]], ':p:h')) - eq([[C:/]], fnamemodify([[\]], ':p')) - eq([[C:/]], fnamemodify([[/]], ':p:h')) - eq([[C:/]], fnamemodify([[/]], ':p')) + root = drive..[[/]] + eq(root, fnamemodify([[\]], ':p:h')) + eq(root, fnamemodify([[\]], ':p')) + eq(root, fnamemodify([[/]], ':p:h')) + eq(root, fnamemodify([[/]], ':p')) else eq('/', fnamemodify([[/]], ':p:h')) eq('/', fnamemodify([[/]], ':p')) -- cgit