summaryrefslogtreecommitdiff
path: root/.ci/ci-make-check.sh
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-11-07 17:06:10 +0100
committerStefan Schmidt <s.schmidt@samsung.com>2018-11-23 14:38:26 +0100
commit8d1a1f603b1d3482158e7bfb05470de65ac0d2d3 (patch)
tree51fd36204f09e9f379ed8acd448e4816b5fb681a /.ci/ci-make-check.sh
parentdefded25ebe6d16a675ee968f8fc0f785310ccdf (diff)
ci: here comes ninja!
this updates the scripts in order to make ninja all / ninja test work as expected. For now there are 2 new jobs options-enabled and options-disabled. mingw and osx will follow in another commit. Benchmarks are disabled for now, as the eina benchmark does not seem to terminate. Differential Revision: https://phab.enlightenment.org/D7255
Diffstat (limited to '.ci/ci-make-check.sh')
-rwxr-xr-x.ci/ci-make-check.sh41
1 files changed, 26 insertions, 15 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index 6813ea7c39..1744b4894c 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -17,21 +17,32 @@ fi
17NUM_TRIES=5 17NUM_TRIES=5
18 18
19travis_fold check "make check-TESTS" 19travis_fold check "make check-TESTS"
20if [ "$DISTRO" != "" ] ; then 20if [ "$BUILDSYSTEM" = "ninja" ] ; then
21 for tries in $(seq 1 ${NUM_TRIES}); do 21 if [ "$DISTRO" != "" ] ; then
22 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break 22 for tries in $(seq 1 ${NUM_TRIES}); do
23 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log 23 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) ninja -C build test) && break
24 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi 24 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
25 false 25 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
26 done 26 false
27#else 27 done
28 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 28 fi
29 #for tries in 1 2 3 ; do 29else
30 #make -j2 -C src/ check-TESTS && break 30 if [ "$DISTRO" != "" ] ; then
31 #cat src/test-suite.log 31 for tries in $(seq 1 ${NUM_TRIES}); do
32 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi 32 (docker exec --env EINA_LOG_BACKTRACE="0" --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break
33 #false 33 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
34 #done 34 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
35 false
36 done
37 #else
38 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
39 #for tries in 1 2 3 ; do
40 #make -j2 -C src/ check-TESTS && break
41 #cat src/test-suite.log
42 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
43 #false
44 #done
45 fi
35fi 46fi
36ret=$? 47ret=$?
37travis_endfold check 48travis_endfold check