diff options
author | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-14 00:45:05 -0400 |
---|---|---|
committer | Stefan Schmidt <s.schmidt@samsung.com> | 2018-07-26 08:55:59 +0200 |
commit | 9b6b88c9a237023c3f47b8638e22bf7b21556b71 (patch) | |
tree | 9ed3648cdd00192425ff20e57481e3ae28e7eff5 /.ci | |
parent | 5e9b5d315a921f54fa36a1cab921dbe2c166a0b7 (diff) |
ci: make check -> make check-TESTS
the tests have all been compiled at this point using the check-build
target (separately) in order to split out test compile failures from
runtime failures, so use the check-TESTS target to run the tests without
checking whether the tests are built first
Differential Revision: https://phab.enlightenment.org/D6619
Diffstat (limited to '.ci')
-rwxr-xr-x | .ci/ci-make-check.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh index 645065fd0e..a069ad92de 100755 --- a/.ci/ci-make-check.sh +++ b/.ci/ci-make-check.sh | |||
@@ -1,13 +1,13 @@ | |||
1 | #!/bin/sh -x | 1 | #!/bin/sh |
2 | 2 | ||
3 | . .ci/travis.sh | 3 | . .ci/travis.sh |
4 | if [ "$1" = "release-ready" ] ; then | 4 | if [ "$1" = "release-ready" ] ; then |
5 | exit 0 | 5 | exit 0 |
6 | fi | 6 | fi |
7 | travis_fold check "make check" | 7 | travis_fold check "make check-TESTS" |
8 | if [ "$DISTRO" != "" ] ; then | 8 | if [ "$DISTRO" != "" ] ; then |
9 | for tries in 1 2 3 ; do | 9 | for tries in 1 2 3 ; do |
10 | (docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 check) && break | 10 | (docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break |
11 | docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log | 11 | docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log |
12 | if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi | 12 | if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi |
13 | false | 13 | false |
@@ -15,7 +15,7 @@ if [ "$DISTRO" != "" ] ; then | |||
15 | else | 15 | else |
16 | export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" | 16 | export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" |
17 | for tries in 1 2 3 ; do | 17 | for tries in 1 2 3 ; do |
18 | make -j2 check && break | 18 | make -j2 -C src/ check-TESTS && break |
19 | cat src/test-suite.log | 19 | cat src/test-suite.log |
20 | if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi | 20 | if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi |
21 | false | 21 | false |