diff options
| -rw-r--r-- | src/Makefile | 11 | ||||
| -rw-r--r-- | src/testdir/test86.in | 15 | ||||
| -rw-r--r-- | src/testdir/test89.in | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 25 insertions, 8 deletions
diff --git a/src/Makefile b/src/Makefile index 4df8f83212..93f026fe1a 100644 --- a/src/Makefile +++ b/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 . diff --git a/src/testdir/test86.in b/src/testdir/test86.in index 8b4a4c1538..ba3557be30 100644 --- a/src/testdir/test86.in +++ b/src/testdir/test86.in @@ -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('@%')) diff --git a/src/testdir/test89.in b/src/testdir/test89.in index 2ad3f25587..1c3079f62f 100644 --- a/src/testdir/test89.in +++ b/src/testdir/test89.in @@ -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 ='' diff --git a/src/version.c b/src/version.c index 60f7eb2759..ca859f7e06 100644 --- a/src/version.c +++ b/src/version.c @@ -728,6 +728,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 14, +/**/ 13, /**/ 12, |