Compare commits

...

3 Commits

Author SHA1 Message Date
Stefan Schmidt 23145f8de7 TESTING 2020-05-28 11:56:32 +02:00
Stefan Schmidt f6b1dd62d6 ci: get rid of all extra asan handling
Now that we have this in meson setup we do not need all the CI script
logic here anymore.
2020-05-28 11:54:11 +02:00
Stefan Schmidt 4e0b0908f2 build: ensure we set all needed asan option for check run as well
Normally we would set the needed detect_odr_violation=0 form our CI
scripts. Move it here to ensure we have it set and it does not get
forgotten when meson overrides the env far.

Fixes the ASAN job on CI.
2020-05-28 11:42:59 +02:00
5 changed files with 2 additions and 28 deletions

View File

@ -24,11 +24,7 @@ fi
travis_fold check "ninja test"
if [ "$DISTRO" != "" ] ; then
for tries in $(seq 1 ${NUM_TRIES}); do
if [ "$1" = "asan" ]; then
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=detect_leaks=0:abort_on_error=0:detect_odr_violation=0 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch) && break
else
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
fi
(docker exec --env EINA_LOG_BACKTRACE="0" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) meson test -t 120 -C build --wrapper dbus-launch ) && break
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
false

View File

@ -8,10 +8,6 @@ if [ "$1" = "release-ready" ] || [ "$1" = "coverity" ] ; then
fi
travis_fold install "ninja install"
if [ "$1" = "asan" ]; then
docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build install
exit $?
fi
if [ "$DISTRO" != "" ] ; then
docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build install
elif [ "$TRAVIS_OS_NAME" = "osx" ]; then

View File

@ -8,11 +8,6 @@ if [ "$1" = "release-ready" ] ; then
fi
travis_fold ninja ninja
if [ "$1" = "asan" ]; then
docker exec --env EIO_MONITOR_POLL=1 --env ASAN_OPTIONS=abort_on_error=0 --env LSAN_OPTIONS=suppressions=/src/.ci/asan-ignore-leaks.supp $(cat $HOME/cid) ninja -C build
exit $?
fi
if [ "$DISTRO" != "" ] ; then
if [ "$1" = "coverity" ] ; then
docker exec --env EIO_MONITOR_POLL=1 --env PATH="/src/cov-analysis-linux64-2019.03/bin:$PATH" $(cat $HOME/cid) sh -c "cov-build --dir cov-int ninja -C build"

View File

@ -73,7 +73,6 @@ jobs:
if: type = cron
env: DISTRO=Fedora31 CI_BUILD_TYPE=coverity
- os: linux
if: type = cron
env: DISTRO=Fedora32 CI_BUILD_TYPE=asan
- os: linux
if: type = cron
@ -139,15 +138,3 @@ before_cache:
else
mv $HOME/Library/Caches/Homebrew $HOME/cachedir/Homebrew
fi
notifications:
irc:
channels:
- "chat.freenode.net#edevelop"
on_success: change
on_failure: always
template:
- "TravisCI build %{build_number} in branch %{branch}: %{result} - %{message} (%{elapsed_time})"
- "Commit: %{commit_subject} (%{commit}) from %{author}"
- "Change view : %{compare_url}"
- "Build details : %{build_url}"

View File

@ -14,7 +14,7 @@ test_env = environment()
test_env.set('EFL_RUN_IN_TREE', '1')
if get_option('b_sanitize') == 'address'
test_env.set('ASAN_OPTIONS', 'detect_leaks=0')
test_env.set('ASAN_OPTIONS', 'detect_leaks=0:detect_odr_violation=0')
endif
version_arr = meson.project_version().split('.')