IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9258 'CI/travis: switch to Ubuntu 16.04'

Browse Source
This commit is contained in:
Justin M. Keyes 2018-11-25 13:04:52 +01:00 committed by GitHub
commit 3a9fd4327a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -1,5 +1,5 @@
dist: trusty dist: xenial
sudo: false
language: c language: c
env: env:
@ -34,6 +34,7 @@ env:
- ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan" - ASAN_OPTIONS="detect_leaks=1:check_initialization_order=1:log_path=$LOG_DIR/asan"
- TSAN_OPTIONS="log_path=$LOG_DIR/tsan" - TSAN_OPTIONS="log_path=$LOG_DIR/tsan"
- UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan" - UBSAN_OPTIONS="print_stacktrace=1 log_path=$LOG_DIR/ubsan"
- ASAN_SYMBOLIZE=asan_symbolize
# Environment variables for Valgrind. # Environment variables for Valgrind.
- VALGRIND_LOG="$LOG_DIR/valgrind-%p.log" - VALGRIND_LOG="$LOG_DIR/valgrind-%p.log"
# If this file exists, the cache is valid (compile was successful). # If this file exists, the cache is valid (compile was successful).
@ -50,11 +51,12 @@ jobs:
include: include:
- stage: normal builds - stage: normal builds
os: linux os: linux
compiler: clang compiler: clang-4.0
env: > env: >
CLANG_SANITIZER=ASAN_UBSAN CLANG_SANITIZER=ASAN_UBSAN
# Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6 # Use Lua so that ASAN can test our embedded Lua support. 8fec4d53d0f6
CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON" CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
ASAN_SYMBOLIZE=asan_symbolize-4.0
sudo: true sudo: true
- os: linux - os: linux
compiler: gcc compiler: gcc
@ -96,11 +98,11 @@ before_cache: ci/before_cache.sh
addons: addons:
apt: apt:
packages: packages:
- apport
- autoconf - autoconf
- automake - automake
- apport
- build-essential - build-essential
- clang - clang-4.0
- cmake - cmake
- cscope - cscope
- g++-multilib - g++-multilib
@ -108,7 +110,7 @@ addons:
- gdb - gdb
- language-pack-tr - language-pack-tr
- libc6-dev-i386 - libc6-dev-i386
- libtool - libtool-bin
- locales - locales
- ninja-build - ninja-build
- pkg-config - pkg-config

2
ci/common/test.sh
View File

@ -83,7 +83,7 @@ valgrind_check() {
asan_check() { asan_check() {
if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then if test "${CLANG_SANITIZER}" = "ASAN_UBSAN" ; then
check_logs "${1}" "*san.*" | asan_symbolize check_logs "${1}" "*san.*" | $ASAN_SYMBOLIZE
fi fi
} }

4
ci/install.sh
View File

@ -8,10 +8,8 @@ if [[ "${CI_TARGET}" == lint ]]; then
fi fi
if [[ "${TRAVIS_OS_NAME}" == osx ]]; then if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
brew install ninja
brew install gettext
brew reinstall libtool
brew install ccache brew install ccache
brew install ninja
export PATH="/usr/local/opt/ccache/libexec:$PATH" export PATH="/usr/local/opt/ccache/libexec:$PATH"
fi fi

1
src/nvim/aucmd.c
View File

@ -26,7 +26,6 @@ void aucmd_schedule_focusgained(bool gained)
} }
static void do_autocmd_focusgained(bool gained) static void do_autocmd_focusgained(bool gained)
FUNC_ATTR_NONNULL_ALL
{ {
static bool recursive = false; static bool recursive = false;

2
src/nvim/eval/encode.c
View File

@ -933,7 +933,7 @@ char *encode_tv2json(typval_T *tv, size_t *len)
#define TYPVAL_ENCODE_CONV_BOOL(tv, num) \ #define TYPVAL_ENCODE_CONV_BOOL(tv, num) \
do { \ do { \
if ((num)) { \ if (num) { \
msgpack_pack_true(packer); \ msgpack_pack_true(packer); \
} else { \ } else { \
msgpack_pack_false(packer); \ msgpack_pack_false(packer); \