Mercurial > vim

comparison src/testdir/test87.in @ 7318:de124c05fe4f v7.4.964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/91376b63877c113fe9a3fff2c1b04bf9504f447f Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 11 16:17:02 2015 +0100 patch 7.4.964 Problem: Test 87 doesn't work in a shadow directory. Solution: Handle the extra subdirectory. (James McCoy, closes https://github.com/vim/vim/issues/515)
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Dec 2015 16:30:04 +0100
parents 692dac7183de
children d4e1c1705137
comparison
equal deleted inserted replaced
7317:9061e3d5a6bb 7318:de124c05fe4f
908 import os 908 import os
909 fnamemodify = vim.Function('fnamemodify') 909 fnamemodify = vim.Function('fnamemodify')
910 cb.append(str(fnamemodify('.', ':p:h:t'))) 910 cb.append(str(fnamemodify('.', ':p:h:t')))
911 cb.append(vim.eval('@%')) 911 cb.append(vim.eval('@%'))
912 os.chdir('..') 912 os.chdir('..')
913 cb.append(str(fnamemodify('.', ':p:h:t'))) 913 path = fnamemodify('.', ':p:h:t')
914 cb.append(vim.eval('@%').replace(os.path.sep, '/')) 914 if path != b'src':
915 # Running tests from a shadow directory, so move up another level
916 # This will result in @% looking like shadow/testdir/test87.in, hence the
917 # slicing to remove the leading path and path separator
918 os.chdir('..')
919 cb.append(str(fnamemodify('.', ':p:h:t')))
920 cb.append(vim.eval('@%')[len(path)+1:].replace(os.path.sep, '/'))
921 os.chdir(path)
922 else:
923 cb.append(str(fnamemodify('.', ':p:h:t')))
924 cb.append(vim.eval('@%').replace(os.path.sep, '/'))
925 del path
915 os.chdir('testdir') 926 os.chdir('testdir')
916 cb.append(str(fnamemodify('.', ':p:h:t'))) 927 cb.append(str(fnamemodify('.', ':p:h:t')))
917 cb.append(vim.eval('@%')) 928 cb.append(vim.eval('@%'))
918 del fnamemodify 929 del fnamemodify
919 EOF 930 EOF