Skip to content

Commit 02113ed

Browse files
committed
patch 8.0.0880: Travis uses an old Ubuntu version
Problem: Travis uses an old Ubuntu version. Solution: Switch from precise to trusty. (Ken Takata, closes #1897)
1 parent bae5a17 commit 02113ed

File tree

6 files changed

+58
-8
lines changed

6 files changed

+58
-8
lines changed

.travis.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: c
2-
# trusty still has a few problems, use precise until they are solved.
3-
dist: precise
2+
dist: trusty
43

54
os:
65
- osx
@@ -22,7 +21,7 @@ env:
2221
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
2322
# ASAN build
2423
- BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
25-
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
24+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
2625
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
2726

2827
sudo: false
@@ -43,12 +42,12 @@ matrix:
4342
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-python3interp --enable-rubyinterp --enable-luainterp'"
4443
- os: osx
4544
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
46-
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
45+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
4746
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
4847
- os: linux
49-
compiler: gcc
48+
compiler: clang
5049
env: BUILD=yes TEST=test SANITIZER_CFLAGS="-g -O1 -DABORT_ON_INTERNAL_ERROR -DEXITFREE -fsanitize=address -fno-omit-frame-pointer"
51-
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan"
50+
FEATURES=huge SRCDIR=./src CHECK_AUTOCONF=no ASAN_OPTIONS="print_stacktrace=1 log_path=asan" LSAN_OPTIONS="suppressions=$TRAVIS_BUILD_DIR/src/testdir/lsan-suppress.txt"
5251
"CONFOPT='--enable-perlinterp --enable-pythoninterp --enable-rubyinterp --enable-luainterp'"
5352
- os: linux
5453
compiler: clang
@@ -74,15 +73,23 @@ addons:
7473
- python3-dev
7574
- liblua5.2-dev
7675
- lua5.2
76+
- ruby-dev
7777
- cscope
78+
- libgtk2.0-dev
7879

7980
before_install:
80-
- if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls==0.3.12; fi
81+
- rvm reset
82+
# Remove /opt/python/3.x.x/bin from $PATH for using system python3.
83+
# ("pyenv global system" doesn't seem to work.)
84+
- if [ "$TRAVIS_OS_NAME" = "linux" ] && which python3 | grep '/opt/python/' > /dev/null; then export PATH=$(echo $PATH | sed -e "s#$(echo $(which python3) | sed -e 's#/python3$##'):##"); fi
85+
- if [ "$COVERAGE" = "yes" ]; then pip install --user cpp-coveralls; fi
8186
# needed for https support for coveralls
8287
# building cffi only works with gcc, not with clang
8388
- if [ "$COVERAGE" = "yes" ]; then CC=gcc pip install --user pyopenssl ndg-httpsclient pyasn1; fi
8489
# Lua is not installed on Travis OSX
8590
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install lua; export LUA_PREFIX=/usr/local; fi
91+
# Use llvm-cov instead of gcov when compiler is clang.
92+
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CC" = "clang" ]; then ln -sf $(which llvm-cov) /home/travis/bin/gcov; fi
8693

8794
# Start virtual framebuffer to be able to test the GUI. Does not work on OS X.
8895
before_script:
@@ -93,7 +100,8 @@ script:
93100
- if [ "$CHECK_AUTOCONF" = "yes" -a "$CC" = "gcc" ]; then make -C src autoconf; fi
94101
- if [ "x$SHADOWOPT" != x ]; then make -C src shadow; fi
95102
- (cd ${SRCDIR} && ./configure --with-features=$FEATURES $CONFOPT --enable-fail-if-missing && if [ "$BUILD" = "yes" ]; then make -j$NPROC; fi)
96-
- if [ "$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; fi
103+
# Show Vim version and also if_xx versions.
104+
- if [ "$BUILD" = "yes" ]; then ${SRCDIR}/vim --version; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-1.vim -c quit > /dev/null; ${SRCDIR}/vim --not-a-term -u NONE -S ${SRCDIR}/testdir/if_ver-2.vim -c quit > /dev/null; cat if_ver.txt; fi
97105
- if [ -n "$ASAN_OPTIONS" ]; then export PATH=/usr/lib/llvm-$(clang -v 2>&1 | sed -n 's/.*version \([1-9]\.[0-9][0-9]*\).*/\1/p')/bin:$PATH; fi
98106
- make $SHADOWOPT $TEST
99107
- if [ -n "$ASAN_OPTIONS" ]; then for log in $(find -type f -name 'asan.*' -size +0); do cat "$log"; err=1; done; fi

Filelist

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ SRC_ALL = \
134134
src/testdir/bench*.in \
135135
src/testdir/bench*.vim \
136136
src/testdir/samples/*.txt \
137+
src/testdir/if_ver*.vim \
137138
src/proto.h \
138139
src/proto/arabic.pro \
139140
src/proto/blowfish.pro \

src/testdir/if_ver-1.vim

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
" Print all interface versions and write the result into if_ver.txt.
2+
" For Ubuntu. Part 1.
3+
4+
redir! > if_ver.txt
5+
if 1
6+
echo "*** Interface versions ***"
7+
echo "\nLua:"
8+
lua print(_VERSION)
9+
" echo "\nLuaJIT:"
10+
" lua print(jit.version)
11+
if has('mzscheme')
12+
echo "\nMzScheme:"
13+
mzscheme (display (version))
14+
endif
15+
echo "\nPerl:"
16+
perl print $^V
17+
echo "\nRuby:"
18+
ruby print RUBY_VERSION
19+
if has('tcl')
20+
echo "\nTcl:"
21+
tcl puts [info patchlevel]
22+
endif
23+
echo "\nPython 2:"
24+
python import sys; print sys.version
25+
endif
26+
redir END

src/testdir/if_ver-2.vim

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
" Print py3 interface version and write the result into if_ver.txt.
2+
" For Ubuntu. Part 2.
3+
4+
redir! >> if_ver.txt
5+
if 1
6+
echo "\nPython 3:"
7+
python3 import sys; print(sys.version)
8+
echo "\n"
9+
endif
10+
redir END

src/testdir/lsan-suppress.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Suppress leaks from X libraries on Ubuntu trusty.
2+
leak:libX11.so.6
3+
leak:libXt.so.6

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ static char *(features[]) =
769769

770770
static int included_patches[] =
771771
{ /* Add new patch number below this line */
772+
/**/
773+
880,
772774
/**/
773775
879,
774776
/**/

0 commit comments

Comments
 (0)