diff options
author | Bram Moolenaar <Bram@vim.org> | 2017-08-06 17:06:24 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2017-08-06 17:06:24 +0200 |
commit | 02113ed4dfa585b4553a7c630b4d7eed0002aebd (patch) | |
tree | 9b6f90ba84fd33af726738b844c68936941417e1 /src | |
parent | bae5a17a738d1a3b5c51d9aa5d99e228d3911955 (diff) | |
download | vim-git-02113ed4dfa585b4553a7c630b4d7eed0002aebd.tar.gz |
patch 8.0.0880: Travis uses an old Ubuntu versionv8.0.0880
Problem: Travis uses an old Ubuntu version.
Solution: Switch from precise to trusty. (Ken Takata, closes #1897)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/if_ver-1.vim | 26 | ||||
-rw-r--r-- | src/testdir/if_ver-2.vim | 10 | ||||
-rw-r--r-- | src/testdir/lsan-suppress.txt | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 41 insertions, 0 deletions
diff --git a/src/testdir/if_ver-1.vim b/src/testdir/if_ver-1.vim new file mode 100644 index 000000000..3c94c9e10 --- /dev/null +++ b/src/testdir/if_ver-1.vim @@ -0,0 +1,26 @@ +" Print all interface versions and write the result into if_ver.txt. +" For Ubuntu. Part 1. + +redir! > if_ver.txt +if 1 + echo "*** Interface versions ***" + echo "\nLua:" + lua print(_VERSION) + " echo "\nLuaJIT:" + " lua print(jit.version) + if has('mzscheme') + echo "\nMzScheme:" + mzscheme (display (version)) + endif + echo "\nPerl:" + perl print $^V + echo "\nRuby:" + ruby print RUBY_VERSION + if has('tcl') + echo "\nTcl:" + tcl puts [info patchlevel] + endif + echo "\nPython 2:" + python import sys; print sys.version +endif +redir END diff --git a/src/testdir/if_ver-2.vim b/src/testdir/if_ver-2.vim new file mode 100644 index 000000000..a6fedb569 --- /dev/null +++ b/src/testdir/if_ver-2.vim @@ -0,0 +1,10 @@ +" Print py3 interface version and write the result into if_ver.txt. +" For Ubuntu. Part 2. + +redir! >> if_ver.txt +if 1 + echo "\nPython 3:" + python3 import sys; print(sys.version) + echo "\n" +endif +redir END diff --git a/src/testdir/lsan-suppress.txt b/src/testdir/lsan-suppress.txt new file mode 100644 index 000000000..5166fbf5c --- /dev/null +++ b/src/testdir/lsan-suppress.txt @@ -0,0 +1,3 @@ +# Suppress leaks from X libraries on Ubuntu trusty. +leak:libX11.so.6 +leak:libXt.so.6 diff --git a/src/version.c b/src/version.c index 784f6c1e2..19e2a0d5c 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 880, +/**/ 879, /**/ 878, |