summaryrefslogtreecommitdiff
path: root/.ci/ci-make-check.sh
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-06-18 10:20:32 -0400
committerStefan Schmidt <s.schmidt@samsung.com>2019-06-19 13:26:06 +0200
commit90f5d5e1f16513378fe5a39ef49ac793fb3fb254 (patch)
tree105aad299b11e335bb1ab286e2e342200b746f46 /.ci/ci-make-check.sh
parent47ada4f72c407ddf66a060e783030ff821233225 (diff)
ci: remove autotools-related conditionals
these are no longer used by anything Reviewed-by: Stefan Schmidt <stefan@datenfreihafen.org> Differential Revision: https://phab.enlightenment.org/D9108
Diffstat (limited to '.ci/ci-make-check.sh')
-rwxr-xr-x.ci/ci-make-check.sh39
1 files changed, 10 insertions, 29 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index ff8f5e0894..bea7ca7b1a 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -17,36 +17,17 @@ fi
17NUM_TRIES=5 17NUM_TRIES=5
18 18
19travis_fold check "make check-TESTS" 19travis_fold check "make check-TESTS"
20if [ "$BUILDSYSTEM" = "ninja" ] ; then 20if [ "$DISTRO" != "" ] ; then
21 if [ "$DISTRO" != "" ] ; then 21 # disable them for this distros, after meson 0.49 is out, this can be removed
22 # disable them for this distros, after meson 0.49 is out, this can be removed 22 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be
23 # https://github.com/mesonbuild/meson/commit/253c581412d7f2b09af353dd83d943454bd555be 23 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then
24 if [ "$DISTRO" != "Ubuntu1810" ] && [ "$DISTRO" != "Debian96" ]; then 24 for tries in $(seq 1 ${NUM_TRIES}); do
25 for tries in $(seq 1 ${NUM_TRIES}); do 25 (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
26 (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 26 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt
27 docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat build/meson-logs/testlog-dbus-launch.txt 27 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
28 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi 28 false
29 false 29 done
30 done
31 fi
32 fi 30 fi
33else
34 if [ "$DISTRO" != "" ] ; then
35 for tries in $(seq 1 ${NUM_TRIES}); do
36 (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
37 docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log
38 if [ $tries != ${NUM_TRIES} ] ; then echo "tests failed, trying again!" ; fi
39 false
40 done
41 #else
42 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
43 #for tries in 1 2 3 ; do
44 #make -j2 -C src/ check-TESTS && break
45 #cat src/test-suite.log
46 #if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi
47 #false
48 #done
49 fi
50fi 31fi
51ret=$? 32ret=$?
52travis_endfold check 33travis_endfold check