To: vim_dev@googlegroups.com Subject: Patch 7.4a.014 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 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) Files: src/testdir/test89.in, src/testdir/test86.in, src/Makefile *** ../vim-7.4a.013/src/testdir/test89.in 2013-07-04 20:50:29.000000000 +0200 --- src/testdir/test89.in 2013-07-13 14:00:31.000000000 +0200 *************** *** 51,57 **** :$put h :" :let cwd=getcwd() ! :cd ../.. :$put ='' :$put ='Testing findfile' :$put ='' --- 51,60 ---- :$put h :" :let cwd=getcwd() ! :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 ='' *** ../vim-7.4a.013/src/testdir/test86.in 2013-06-26 21:43:04.000000000 +0200 --- src/testdir/test86.in 2013-07-13 14:00:31.000000000 +0200 *************** *** 857,864 **** 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, '/')) os.chdir('testdir') cb.append(fnamemodify('.', ':p:h:t')) cb.append(vim.eval('@%')) --- 857,875 ---- cb.append(fnamemodify('.', ':p:h:t')) cb.append(vim.eval('@%')) os.chdir('..') ! 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('@%')) *** ../vim-7.4a.013/src/Makefile 2013-07-12 20:16:53.000000000 +0200 --- src/Makefile 2013-07-13 14:00:31.000000000 +0200 *************** *** 420,428 **** # 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=dynamic ! #CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic # RUBY --- 420,428 ---- # 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=dynamic ! CONF_OPT_PYTHON3 = --enable-python3interp #CONF_OPT_PYTHON3 = --enable-python3interp=dynamic # RUBY *************** *** 499,505 **** #CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=big ! #CONF_OPT_FEAT = --with-features=huge # COMPILED BY - For including a specific e-mail address for ":version". #CONF_OPT_COMPBY = "--with-compiledby=John Doe " --- 499,505 ---- #CONF_OPT_FEAT = --with-features=small #CONF_OPT_FEAT = --with-features=normal #CONF_OPT_FEAT = --with-features=big ! CONF_OPT_FEAT = --with-features=huge # COMPILED BY - For including a specific e-mail address for ":version". #CONF_OPT_COMPBY = "--with-compiledby=John Doe " *************** *** 567,573 **** #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 -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 --- 567,573 ---- #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 -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,619 **** # 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_LIBS = -lccmalloc ##################################################### --- 613,619 ---- # 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_LIBS = -lccmalloc ##################################################### *************** *** 2366,2371 **** --- 2366,2372 ---- ../../testdir/vimrc.unix \ ../../testdir/*.in \ ../../testdir/*.vim \ + ../../testdir/python* \ ../../testdir/test83-tags? \ ../../testdir/*.ok . *** ../vim-7.4a.013/src/version.c 2013-07-13 12:36:07.000000000 +0200 --- src/version.c 2013-07-13 14:01:48.000000000 +0200 *************** *** 729,730 **** --- 729,732 ---- { /* Add new patch number below this line */ + /**/ + 14, /**/ -- Kiss me twice. I'm schizophrenic. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///