Patch 8.2.0481
Problem: Travis is still using trusty.
Solution: Adjust config to use bionic. (Ozaki Kiichi, closes #5868)
Files: .travis.yml, src/testdir/lsan-suppress.txt
*** ../vim-8.2.0480/.travis.yml 2020-03-20 18:11:15.774980183 +0100
--- .travis.yml 2020-03-30 19:11:12.357669566 +0200
***************
*** 26,38 ****
linux: &linux
os: linux
! dist: trusty
addons:
apt:
! sources:
! # Need msgfmt 0.19.8 to be able to generate .desktop files
! - sourceline: 'ppa:ricotz/toolchain'
! packages: &linux-packages
- autoconf
- clang
- lcov
--- 26,35 ----
linux: &linux
os: linux
! dist: bionic
addons:
apt:
! packages:
- autoconf
- clang
- lcov
***************
*** 41,74 ****
- libperl-dev
- python-dev
- python3-dev
! - liblua5.2-dev
! - lua5.2
- ruby-dev
- tcl-dev
- cscope
- libgtk2.0-dev
- desktop-file-utils
before_install:
- rvm reset
- # Remove /opt/python/3.x.x/bin from $PATH for using system python3.
- # ("pyenv global system" doesn't seem to work.)
- - |
- if [[ "$(which python3)" =~ ^/opt/python/ ]]; then
- export PATH=$(py3=$(which python3); echo ${PATH//${py3%/python3}:/})
- fi
# Use llvm-cov instead of gcov when compiler is clang.
- |
if [[ "${CC}" = "clang" ]]; then
! ln -sf "$(which llvm-cov)" /home/travis/bin/gcov
fi
! before_script:
! # Start virtual framebuffer to be able to test the GUI. For dists newer
! # than trusty, the "services: xvfb" setting should be used instead
- |
! if [[ ${TRAVIS_DIST} = trusty ]]; then
! export DISPLAY=:99.0
! sh -e /etc/init.d/xvfb start && sleep 3
fi
- sudo bash ci/load-snd-dummy.sh || true
- sudo usermod -a -G audio $USER
- do_test() { sg audio "sg $(id -gn) '$*'"; }
--- 38,70 ----
- libperl-dev
- python-dev
- python3-dev
! - liblua5.3-dev
! - lua5.3
- ruby-dev
- tcl-dev
- cscope
- libgtk2.0-dev
- desktop-file-utils
+ - libtool-bin
+ services:
+ - xvfb
before_install:
- rvm reset
# Use llvm-cov instead of gcov when compiler is clang.
- |
if [[ "${CC}" = "clang" ]]; then
! ln -sf "$(command -v llvm-cov)" /home/travis/bin/gcov
fi
! # Setup lua5.3 manually since its package doesn't provide alternative.
! # https://bugs.launchpad.net/ubuntu/+source/lua5.3/+bug/1707212
- |
! if [[ "${CONFOPT}" =~ luainterp ]]; then
! sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3
10
fi
+ before_script:
+ # On travis bionic-amd64 gethostbyname() resolves "localhost" to
127.0.1.1
+ # so that makes various channel tests fail.
+ - sudo sed -i '/^127\.0\.1\.1\s/s/\blocalhost\b//g' /etc/hosts
- sudo bash ci/load-snd-dummy.sh || true
- sudo usermod -a -G audio $USER
- do_test() { sg audio "sg $(id -gn) '$*'"; }
***************
*** 90,96 ****
- /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
before_install:
- rvm reset
! # Lua is not installed on Travis OSX
- export LUA_PREFIX=/usr/local
coverage: &coverage
--- 86,92 ----
- /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/
before_install:
- rvm reset
! # Lua is not installed on macOS
- export LUA_PREFIX=/usr/local
coverage: &coverage
***************
*** 101,110 ****
- (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash))
asan_symbolize: &asan_symbolize
! - |
! while read log; do
! asan_symbolize < "${log}"
! done < <(find . -type f -name 'asan.*' -size +0)
branches:
except:
--- 97,106 ----
- (cd "${SRCDIR}" && bash <(curl -s https://codecov.io/bash))
asan_symbolize: &asan_symbolize
! # Update pyenv to fix the error "/opt/pyenv/libexec/pyenv: line 43: cd:
asan_symbolize-6.0: Not a directory".
! # https://github.com/pyenv/pyenv/issues/580
! - (cd "${PYENV_ROOT}" && git fetch -p origin && git checkout "$(git
rev-list --tags -n1)") &>/dev/null || true
! - find . -type f -name 'asan.*' -size +0 2>/dev/null | xargs -I{} -n1 -t
asan_symbolize -l{}
branches:
except:
***************
*** 205,219 ****
name: huge/gcc-s390x
compiler: gcc
env: *linux-huge
! addons:
! apt:
! packages:
! - *linux-packages
! - libtool-bin
- <<: *linux
name: huge+coverage/clang
compiler: clang
! env: *linux-huge
after_success: *coverage
- <<: *linux
name: huge+coverage/gcc
--- 201,214 ----
name: huge/gcc-s390x
compiler: gcc
env: *linux-huge
! services: []
- <<: *linux
name: huge+coverage/clang
compiler: clang
! env:
! - *linux-huge
! # Clang cannot compile test_libvterm with "--coverage" flag.
! - TEST=scripttests
after_success: *coverage
- <<: *linux
name: huge+coverage/gcc
*** ../vim-8.2.0480/src/testdir/lsan-suppress.txt 2017-08-06
17:03:14.000000000 +0200
--- src/testdir/lsan-suppress.txt 2020-03-30 19:11:12.357669566 +0200
***************
*** 1,3 ****
! # Suppress leaks from X libraries on Ubuntu trusty.
leak:libX11.so.6
leak:libXt.so.6
--- 1,11 ----
! # Suppress leaks from X libraries on Ubuntu bionic.
leak:libX11.so.6
leak:libXt.so.6
+ leak:libcairo.so.2
+ leak:libfontconfig.so.1
+ leak:libglib-2.0.so.0
+ leak:libtinfo.so.5
+ # Suppress leaks from other language libraries.
+ leak:libperl.so.*
+ leak:libpython*.so.*
+ leak:libruby*.so.*
*** ../vim-8.2.0480/src/version.c 2020-03-29 21:38:10.277149761 +0200
--- src/version.c 2020-03-30 19:12:23.809438066 +0200
***************
*** 740,741 ****
--- 740,743 ----
{ /* Add new patch number below this line */
+ /**/
+ 481,
/**/
--
TALL KNIGHT: We are now no longer the Knights Who Say Ni!
ONE KNIGHT: Ni!
OTHERS: Sh!
ONE KNIGHT: (whispers) Sorry.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- 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 ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/202003301713.02UHDxoj028283%40masaka.moolenaar.net.
