Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove build with ASAN from Travis builds

Browse Source
This commit is contained in:
Ilya Sinitsyn
2020-12-30 13:49:26 +07:00
parent ea6af85859
commit 67d286d499
2 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -40,8 +40,8 @@ jobs:
name: wxGTK ANSI Ubuntu 20.04 name: wxGTK ANSI Ubuntu 20.04
- dist: focal - dist: focal
compiler: gcc compiler: gcc
env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-compat30 --disable-sys-libs" wxSKIP_SAMPLES=1 wxUSE_ASAN=1 env: wxGTK_VERSION=3 wxCONFIGURE_FLAGS="--disable-compat30 --disable-sys-libs" wxSKIP_SAMPLES=1
name: wxGTK Ubuntu 20.04 with ASAN name: wxGTK Ubuntu 20.04
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
compiler: clang compiler: clang

17
build/tools/travis-ci.sh
View File

@@ -21,11 +21,6 @@ case $wxTOOLSET in
fi fi
cmake --version cmake --version
if [ "$wxUSE_ASAN" = 1 ]; then
echo "ASAN currently isn't supported in CMake builds"
exit 1
fi
echo 'travis_fold:start:configure' echo 'travis_fold:start:configure'
echo 'Configuring...' echo 'Configuring...'
mkdir build_cmake mkdir build_cmake
@@ -72,17 +67,7 @@ case $wxTOOLSET in
wxCONFIGURE_OPTIONS="--with-gtk=$wxGTK_VERSION $wxCONFIGURE_OPTIONS" wxCONFIGURE_OPTIONS="--with-gtk=$wxGTK_VERSION $wxCONFIGURE_OPTIONS"
fi fi
if [ "$wxUSE_ASAN" = 1 ]; then ./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
export LSAN_OPTIONS=suppressions=$(pwd)/misc/suppressions/lsan
wxASAN_CFLAGS="-fsanitize=address -fno-omit-frame-pointer"
wxASAN_CXXFLAGS=$wxASAN_CFLAGS
wxASAN_LDFLAGS="-fsanitize=address"
./configure $wxCONFIGURE_OPTIONS --enable-debug "CFLAGS=$wxASAN_CFLAGS" "CXXFLAGS=$wxASAN_CXXFLAGS" "LDFLAGS=$wxASAN_LDFLAGS" || rc=$?
else
./configure $wxCONFIGURE_OPTIONS --disable-debug_info || rc=$?
fi
if [ -n "$rc" ]; then if [ -n "$rc" ]; then
echo '*** Configuring failed, contents of config.log follows: ***' echo '*** Configuring failed, contents of config.log follows: ***'