Compare commits

...

2 Commits

Author SHA1 Message Date
Marcel Hollerbach 8c7dfd1925 ci: do not build tests on ci
we need to do the same on any platform that upgrades check from 0.15.0 to
0.15.1. For now this is only with macos

Differential Revision: https://phab.enlightenment.org/D12068
2020-07-27 13:53:41 +02:00
Marcel Hollerbach 2b0b8f0930 build: warn of faulty check version
Differential Revision: https://phab.enlightenment.org/D12067
2020-07-27 13:53:29 +02:00
2 changed files with 5 additions and 1 deletions

View File

@ -96,7 +96,7 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
zlib_vers=$(grep ZLIB_VERSION /usr/include/zlib.h|head -n1|awk '{print $3}'|cut -d'"' -f2)
sed -iE "s/REPLACE_THIS/$zlib_vers/" .ci/zlib.pc
export PKG_CONFIG_PATH="/usr/local/opt/openssl/lib/pkgconfig:/usr/local/Cellar/libffi/$LIBFFI_VER/lib/pkgconfig:$(pwd)/.ci"
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false
mkdir build && meson build -Dopengl=full -Decore-imf-loaders-disabler=scim,ibus -Dx11=false -Davahi=false -Deeze=false -Dsystemd=false -Dnls=false -Dcocoa=true -Dgstreamer=false -Dbuild-tests=false
else # Native Ubuntu Linux Travis builds (non-docker)
OPTS=" -Decore-imf-loaders-disabler=scim,ibus"

View File

@ -582,6 +582,10 @@ subdir(join_paths('data'))
if get_option('build-tests')
check = dependency('check')
if (check.version() == '0.15.1')
error('There is a bug in check@0.15.1 which does not allow efl to be compiled with it. Please downgrade / upgrade or disable tests')
endif
test_env = environment()
test_env.set('EFL_RUN_IN_TREE', '1')