summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2020-05-28 19:32:03 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2020-05-29 12:19:51 +0200
commit922cf53e16488a344df77eec0d80d58df7a5b102 (patch)
tree1f6c02f53b5b1371fcee9189050b63b1e9c26ca0
parentf2e0ff9d000aa25bcd69541219d551288ba61041 (diff)
ci: travis: enable efl-one in our all enabled builddevs/stefan/ci-efl-one
After a successful build we run the efl-one test script to see if it drags in unwanted libs. Differential Revision: https://phab.enlightenment.org/D11906
-rwxr-xr-x.ci/ci-configure.sh2
-rwxr-xr-x.ci/ci-make.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 41e63ad24a..1b9474c43d 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -17,7 +17,7 @@ if [ "$DISTRO" != "" ] ; then
17 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \ 17 ENABLED_LINUX_COPTS=" -Dfb=true -Dsdl=true -Dbuffer=true -Dbuild-id=travis-build \
18 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \ 18 -Ddebug-threads=true -Dglib=true -Dg-mainloop=true -Dxpresent=true -Dxinput22=true \
19 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \ 19 -Devas-loaders-disabler=json -Decore-imf-loaders-disabler= \
20 -Dharfbuzz=true -Dpixman=true -Dhyphen=true \ 20 -Dharfbuzz=true -Dpixman=true -Dhyphen=true -Defl-one=true \
21 -Dvnc-server=true -Dbindings=luajit,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true" 21 -Dvnc-server=true -Dbindings=luajit,cxx,mono -Delogind=false -Dinstall-eo-files=true -Dphysics=true"
22 22
23 # Enabled png, jpeg evas loader for in tree edje file builds 23 # Enabled png, jpeg evas loader for in tree edje file builds
diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh
index 9d0574a5cf..7e72aa80db 100755
--- a/.ci/ci-make.sh
+++ b/.ci/ci-make.sh
@@ -20,6 +20,9 @@ if [ "$DISTRO" != "" ] ; then
20 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh" 20 docker exec --env EIO_MONITOR_POLL=1 --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c ".ci/coverity-upload.sh"
21 else 21 else
22 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build 22 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build
23 if [ "$1" = "options-enabled" ]; then # we have efl-one on and want to check it after build
24 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) python scripts/test-efl-one.py build
25 fi
23 fi 26 fi
24elif [ "$TRAVIS_OS_NAME" = "osx" ]; then 27elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
25 latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)" 28 latest_brew_python3_bin="$(ls -1d /usr/local/Cellar/python/3.*/bin | sort -n | tail -n1)"