mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
Merge #947 'Remove Clang 3.4 installation in travis.sh.'
This commit is contained in:
John Szakmeister
commit
e1075ffff9
@ -6,67 +6,67 @@ mkdir -p "$tmpdir"
|
|||||||
suppressions="$(pwd)/.valgrind.supp"
|
suppressions="$(pwd)/.valgrind.supp"
|
||||||
|
|
||||||
valgrind_check() {
|
valgrind_check() {
|
||||||
(
|
(
|
||||||
cd $1
|
cd $1
|
||||||
set -- valgrind-[*] valgrind-*
|
set -- valgrind-[*] valgrind-*
|
||||||
case $1$2 in
|
case $1$2 in
|
||||||
'valgrind-[*]valgrind-*')
|
'valgrind-[*]valgrind-*')
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
shift
|
shift
|
||||||
local err=''
|
local err=''
|
||||||
for valgrind_log in "$@"; do
|
for valgrind_log in "$@"; do
|
||||||
# Remove useless warning
|
# Remove useless warning
|
||||||
sed -i "$valgrind_log" \
|
sed -i "$valgrind_log" \
|
||||||
-e '/Warning: noted but unhandled ioctl/d' \
|
-e '/Warning: noted but unhandled ioctl/d' \
|
||||||
-e '/could cause spurious value errors to appear/d' \
|
-e '/could cause spurious value errors to appear/d' \
|
||||||
-e '/See README_MISSING_SYSCALL_OR_IOCTL for guidance/d'
|
-e '/See README_MISSING_SYSCALL_OR_IOCTL for guidance/d'
|
||||||
if [ "$(stat -c %s $valgrind_log)" != "0" ]; then
|
if [ "$(stat -c %s $valgrind_log)" != "0" ]; then
|
||||||
# if after removing the warning, the log still has errors, show its
|
# if after removing the warning, the log still has errors, show its
|
||||||
# contents and set the flag so we exit with non-zero status
|
# contents and set the flag so we exit with non-zero status
|
||||||
cat "$valgrind_log"
|
cat "$valgrind_log"
|
||||||
err=1
|
err=1
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [ -n "$err" ]; then
|
if [ -n "$err" ]; then
|
||||||
echo "Runtime errors detected"
|
echo "Runtime errors detected"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
asan_check() {
|
asan_check() {
|
||||||
(
|
(
|
||||||
cd $1
|
cd $1
|
||||||
set -- [*]san.[*] *san.*
|
set -- [*]san.[*] *san.*
|
||||||
case $1$2 in
|
case $1$2 in
|
||||||
'[*]san.[*]*san.*')
|
'[*]san.[*]*san.*')
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
shift
|
shift
|
||||||
cat "$@"
|
cat "$@"
|
||||||
echo "Runtime errors detected"
|
echo "Runtime errors detected"
|
||||||
exit 1
|
exit 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
set_environment() {
|
set_environment() {
|
||||||
local prefix="$1"
|
local prefix="$1"
|
||||||
eval $($prefix/bin/luarocks path)
|
eval $($prefix/bin/luarocks path)
|
||||||
export PATH="$prefix/bin:$PATH"
|
export PATH="$prefix/bin:$PATH"
|
||||||
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
|
export PKG_CONFIG_PATH="$prefix/lib/pkgconfig"
|
||||||
export USE_BUNDLED_DEPS=OFF
|
export USE_BUNDLED_DEPS=OFF
|
||||||
}
|
}
|
||||||
|
|
||||||
# install prebuilt dependencies
|
# install prebuilt dependencies
|
||||||
if [ ! -d /opt/neovim-deps ]; then
|
if [ ! -d /opt/neovim-deps ]; then
|
||||||
cd /opt
|
cd /opt
|
||||||
sudo git clone --depth=1 git://github.com/tarruda/neovim-deps
|
sudo git clone --depth=1 git://github.com/neovim/deps neovim-deps
|
||||||
cd -
|
cd -
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Travis reports back that it has 32-cores via /proc/cpuinfo, but it's not
|
# Travis reports back that it has 32-cores via /proc/cpuinfo, but it's not
|
||||||
@ -92,110 +92,91 @@ if [ "$TRAVIS_BUILD_TYPE" = "coverity" ]; then
|
|||||||
set -e
|
set -e
|
||||||
exit 0
|
exit 0
|
||||||
elif [ "$TRAVIS_BUILD_TYPE" = "clang/asan" ]; then
|
elif [ "$TRAVIS_BUILD_TYPE" = "clang/asan" ]; then
|
||||||
if [ ! -d /usr/local/clang-3.4 ]; then
|
clang_version=3.4
|
||||||
echo "Downloading clang 3.4..."
|
if [ ! -d /usr/local/clang-$clang_version ]; then
|
||||||
sudo sh <<- "EOF"
|
echo "Downloading clang $clang_version..."
|
||||||
mkdir /usr/local/clang-3.4
|
sudo mkdir /usr/local/clang-$clang_version
|
||||||
wget -q -O - http://llvm.org/releases/3.4/clang+llvm-3.4-x86_64-unknown-ubuntu12.04.tar.xz |
|
wget -q -O - http://llvm.org/releases/$clang_version/clang+llvm-$clang_version-x86_64-unknown-ubuntu12.04.xz \
|
||||||
unxz -c | tar xf - --strip-components=1 -C /usr/local/clang-3.4
|
| sudo tar xJf - --strip-components=1 -C /usr/local/clang-$clang_version
|
||||||
EOF
|
symbolizer=/usr/local/clang-$clang_version/bin/llvm-symbolizer
|
||||||
fi
|
export CC=/usr/local/clang-$clang_version/bin/clang
|
||||||
sudo pip install cpp-coveralls
|
else
|
||||||
|
export CC=clang
|
||||||
|
symbolizer=/usr/local/clang-3.4/bin/llvm-symbolizer
|
||||||
|
fi
|
||||||
|
sudo pip install cpp-coveralls
|
||||||
|
set_environment /opt/neovim-deps
|
||||||
|
|
||||||
export CC=clang
|
export SANITIZE=1
|
||||||
set_environment /opt/neovim-deps
|
export ASAN_SYMBOLIZER_PATH=$symbolizer
|
||||||
if test -f /usr/local/clang-3.4/bin/clang; then
|
export ASAN_OPTIONS="detect_leaks=1:log_path=$tmpdir/asan"
|
||||||
USE_CLANG_34=true
|
export TSAN_OPTIONS="external_symbolizer_path=$symbolizer:log_path=$tmpdir/tsan"
|
||||||
export CC=/usr/local/clang-3.4/bin/clang
|
|
||||||
symbolizer=/usr/local/clang-3.4/bin/llvm-symbolizer
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Try to detect clang-3.4 installed via apt and through llvm.org/apt/.
|
export SKIP_UNITTEST=1
|
||||||
if dpkg -s clang-3.4 > /dev/null 2>&1; then
|
export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works
|
||||||
USE_CLANG_34=true
|
|
||||||
export CC=/usr/bin/clang
|
|
||||||
symbolizer=/usr/bin/llvm-symbolizer-3.4
|
|
||||||
fi
|
|
||||||
|
|
||||||
install_dir="$(pwd)/dist"
|
install_dir="$(pwd)/dist"
|
||||||
# temporary directory for writing sanitizer logs
|
$MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON"
|
||||||
|
$MAKE_CMD
|
||||||
# need the symbolizer path for stack traces with source information
|
if ! $MAKE_CMD test; then
|
||||||
if [ -n "$USE_CLANG_34" ]; then
|
reset
|
||||||
export ASAN_OPTIONS="detect_leaks=1:"
|
asan_check "$tmpdir"
|
||||||
else
|
exit 1
|
||||||
symbolizer=/usr/local/clang-3.3/bin/llvm-symbolizer
|
fi
|
||||||
fi
|
asan_check "$tmpdir"
|
||||||
|
coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.'
|
||||||
export SANITIZE=1
|
$MAKE_CMD install
|
||||||
export ASAN_SYMBOLIZER_PATH=$symbolizer
|
|
||||||
export ASAN_OPTIONS="${ASAN_OPTIONS}log_path=$tmpdir/asan"
|
|
||||||
export TSAN_OPTIONS="external_symbolizer_path=$symbolizer:log_path=$tmpdir/tsan"
|
|
||||||
|
|
||||||
export SKIP_UNITTEST=1
|
|
||||||
export UBSAN_OPTIONS="log_path=$tmpdir/ubsan" # not sure if this works
|
|
||||||
|
|
||||||
$MAKE_CMD cmake CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DCMAKE_INSTALL_PREFIX=$install_dir -DUSE_GCOV=ON"
|
|
||||||
$MAKE_CMD
|
|
||||||
if ! $MAKE_CMD test; then
|
|
||||||
reset
|
|
||||||
asan_check "$tmpdir"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
asan_check "$tmpdir"
|
|
||||||
coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.'
|
|
||||||
$MAKE_CMD install
|
|
||||||
elif [ "$TRAVIS_BUILD_TYPE" = "gcc/unittest" ]; then
|
elif [ "$TRAVIS_BUILD_TYPE" = "gcc/unittest" ]; then
|
||||||
sudo pip install cpp-coveralls
|
sudo pip install cpp-coveralls
|
||||||
export CC=gcc
|
export CC=gcc
|
||||||
set_environment /opt/neovim-deps
|
set_environment /opt/neovim-deps
|
||||||
export SKIP_EXEC=1
|
export SKIP_EXEC=1
|
||||||
$MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest
|
$MAKE_CMD CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP -DUSE_GCOV=ON" unittest
|
||||||
coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.'
|
coveralls --encoding iso-8859-1 || echo 'coveralls upload failed.'
|
||||||
elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then
|
elif [ "$TRAVIS_BUILD_TYPE" = "gcc/ia32" ]; then
|
||||||
set_environment /opt/neovim-deps/32
|
set_environment /opt/neovim-deps/32
|
||||||
|
|
||||||
# Pins the version of the java package installed on the Travis VMs
|
# Pins the version of the java package installed on the Travis VMs
|
||||||
# and avoids a lengthy upgrade process for them.
|
# and avoids a lengthy upgrade process for them.
|
||||||
sudo apt-mark hold oracle-java7-installer oracle-java8-installer
|
sudo apt-mark hold oracle-java7-installer oracle-java8-installer
|
||||||
|
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
|
|
||||||
# Need this to keep apt-get from removing gcc when installing libncurses
|
# Need this to keep apt-get from removing gcc when installing libncurses
|
||||||
# below.
|
# below.
|
||||||
sudo apt-get install libc6-dev libc6-dev:i386
|
sudo apt-get install libc6-dev libc6-dev:i386
|
||||||
|
|
||||||
# Do this separately so that things get configured correctly, otherwise
|
# Do this separately so that things get configured correctly, otherwise
|
||||||
# libncurses fails to install.
|
# libncurses fails to install.
|
||||||
sudo apt-get install gcc-multilib g++-multilib
|
sudo apt-get install gcc-multilib g++-multilib
|
||||||
|
|
||||||
# Install the dev version to get the pkg-config and symlinks installed
|
# Install the dev version to get the pkg-config and symlinks installed
|
||||||
# correctly.
|
# correctly.
|
||||||
sudo apt-get install libncurses5-dev:i386
|
sudo apt-get install libncurses5-dev:i386
|
||||||
|
|
||||||
CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP \
|
CMAKE_EXTRA_FLAGS="-DTRAVIS_CI_BUILD=ON -DBUSTED_OUTPUT_TYPE=TAP \
|
||||||
-DCMAKE_SYSTEM_PROCESSOR=i386 \
|
-DCMAKE_SYSTEM_PROCESSOR=i386 \
|
||||||
-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \
|
-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32 \
|
||||||
-DFIND_LIBRARY_USE_LIB64_PATHS=OFF \
|
-DFIND_LIBRARY_USE_LIB64_PATHS=OFF \
|
||||||
-DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \
|
-DCMAKE_IGNORE_PATH=/lib:/usr/lib:/usr/local/lib \
|
||||||
-DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake"
|
-DCMAKE_TOOLCHAIN_FILE=cmake/i386-linux-gnu.toolchain.cmake"
|
||||||
$MAKE_CMD CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" unittest
|
$MAKE_CMD CMAKE_EXTRA_FLAGS="${CMAKE_EXTRA_FLAGS}" unittest
|
||||||
$MAKE_CMD test
|
$MAKE_CMD test
|
||||||
elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then
|
elif [ "$TRAVIS_BUILD_TYPE" = "clint" ]; then
|
||||||
./scripts/clint.sh
|
./scripts/clint.sh
|
||||||
elif [ "$TRAVIS_BUILD_TYPE" = "api/python" ]; then
|
elif [ "$TRAVIS_BUILD_TYPE" = "api/python" ]; then
|
||||||
set_environment /opt/neovim-deps
|
set_environment /opt/neovim-deps
|
||||||
$MAKE_CMD
|
$MAKE_CMD
|
||||||
sudo apt-get install expect valgrind
|
sudo apt-get install expect valgrind
|
||||||
git clone --depth=1 -b master git://github.com/neovim/python-client
|
git clone --depth=1 -b master git://github.com/neovim/python-client
|
||||||
cd python-client
|
cd python-client
|
||||||
sudo pip install .
|
sudo pip install .
|
||||||
sudo pip install nose
|
sudo pip install nose
|
||||||
test_cmd="nosetests --verbosity=2"
|
test_cmd="nosetests --verbosity=2"
|
||||||
nvim_cmd="valgrind -q --track-origins=yes --leak-check=yes --suppressions=$suppressions --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE"
|
nvim_cmd="valgrind -q --track-origins=yes --leak-check=yes --suppressions=$suppressions --log-file=$tmpdir/valgrind-%p.log ../build/bin/nvim -u NONE"
|
||||||
if ! ../scripts/run-api-tests.exp "$test_cmd" "$nvim_cmd"; then
|
if ! ../scripts/run-api-tests.exp "$test_cmd" "$nvim_cmd"; then
|
||||||
valgrind_check "$tmpdir"
|
valgrind_check "$tmpdir"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
valgrind_check "$tmpdir"
|
valgrind_check "$tmpdir"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user