mirror of
https://github.com/vim/vim.git
synced 2025-07-25 10:54:51 -04:00
updated for version 7.4a.014
Problem: Test 86 and 89 have a problem with using a shadow dir. Solution: Adjust for the different directory structure. (James McCoy)
This commit is contained in:
parent
3ff9b185fe
commit
8e46f7264c
11
src/Makefile
11
src/Makefile
@ -420,9 +420,9 @@ CClink = $(CC)
|
||||
# dlopen(), dlsym(), dlclose(), i.e. pythonX.Y.so must be available
|
||||
# However, this may still cause problems, such as "import termios" failing.
|
||||
# Build two separate versions of Vim in that case.
|
||||
#CONF_OPT_PYTHON = --enable-pythoninterp
|
||||
CONF_OPT_PYTHON = --enable-pythoninterp
|
||||
#CONF_OPT_PYTHON = --enable-pythoninterp=dynamic
|
||||
#CONF_OPT_PYTHON3 = --enable-python3interp
|
||||
CONF_OPT_PYTHON3 = --enable-python3interp
|
||||
#CONF_OPT_PYTHON3 = --enable-python3interp=dynamic
|
||||
|
||||
# RUBY
|
||||
@ -499,7 +499,7 @@ CClink = $(CC)
|
||||
#CONF_OPT_FEAT = --with-features=small
|
||||
#CONF_OPT_FEAT = --with-features=normal
|
||||
#CONF_OPT_FEAT = --with-features=big
|
||||
#CONF_OPT_FEAT = --with-features=huge
|
||||
CONF_OPT_FEAT = --with-features=huge
|
||||
|
||||
# COMPILED BY - For including a specific e-mail address for ":version".
|
||||
#CONF_OPT_COMPBY = "--with-compiledby=John Doe <JohnDoe@yahoo.com>"
|
||||
@ -567,7 +567,7 @@ CClink = $(CC)
|
||||
#CFLAGS = -g -O2 '-DSTARTUPTIME="vimstartup"' -fno-strength-reduce -Wall -Wmissing-prototypes
|
||||
|
||||
# Use this with GCC to check for mistakes, unused arguments, etc.
|
||||
#CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
|
||||
CFLAGS = -g -Wall -Wextra -Wmissing-prototypes -Wunreachable-code -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1
|
||||
#CFLAGS = -g -O2 -Wall -Wextra -Wmissing-prototypes -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1 -DU_DEBUG
|
||||
#PYTHON_CFLAGS_EXTRA = -Wno-missing-field-initializers
|
||||
#MZSCHEME_CFLAGS_EXTRA = -Wno-unreachable-code -Wno-unused-parameter
|
||||
@ -613,7 +613,7 @@ LINT_OPTIONS = -beprxzF
|
||||
# Configuration is in the .ccmalloc or ~/.ccmalloc file.
|
||||
# Doesn't work very well, since memory linked to from global variables
|
||||
# (in libraries) is also marked as leaked memory.
|
||||
#LEAK_CFLAGS = -DEXITFREE
|
||||
LEAK_CFLAGS = -DEXITFREE
|
||||
#LEAK_LIBS = -lccmalloc
|
||||
|
||||
#####################################################
|
||||
@ -2366,6 +2366,7 @@ shadow: runtime pixmaps
|
||||
../../testdir/vimrc.unix \
|
||||
../../testdir/*.in \
|
||||
../../testdir/*.vim \
|
||||
../../testdir/python* \
|
||||
../../testdir/test83-tags? \
|
||||
../../testdir/*.ok .
|
||||
|
||||
|
@ -857,8 +857,19 @@ fnamemodify = vim.Function('fnamemodify')
|
||||
cb.append(fnamemodify('.', ':p:h:t'))
|
||||
cb.append(vim.eval('@%'))
|
||||
os.chdir('..')
|
||||
cb.append(fnamemodify('.', ':p:h:t'))
|
||||
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
|
||||
path = fnamemodify('.', ':p:h:t')
|
||||
if path != 'src':
|
||||
# Running tests from a shadow directory, so move up another level
|
||||
# This will result in @% looking like shadow/testdir/test86.in, hence the
|
||||
# extra fnamemodify
|
||||
os.chdir('..')
|
||||
cb.append(fnamemodify('.', ':p:h:t'))
|
||||
cb.append(fnamemodify(vim.eval('@%'), ':s?^%s.??' % path).replace(os.path.sep, '/'))
|
||||
os.chdir(path)
|
||||
del path
|
||||
else:
|
||||
cb.append(fnamemodify('.', ':p:h:t'))
|
||||
cb.append(vim.eval('@%').replace(os.path.sep, '/'))
|
||||
os.chdir('testdir')
|
||||
cb.append(fnamemodify('.', ':p:h:t'))
|
||||
cb.append(vim.eval('@%'))
|
||||
|
@ -51,7 +51,10 @@ STARTTEST
|
||||
:$put h
|
||||
:"
|
||||
:let cwd=getcwd()
|
||||
:cd ../..
|
||||
:cd ..
|
||||
:" Tests may be run from a shadow directory, so an extra cd needs to be done to
|
||||
:" get above src/
|
||||
:if fnamemodify(getcwd(), ':t') != 'src' | cd ../.. | else | cd .. | endif
|
||||
:$put =''
|
||||
:$put ='Testing findfile'
|
||||
:$put =''
|
||||
|
@ -727,6 +727,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
14,
|
||||
/**/
|
||||
13,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user