diff options
-rwxr-xr-x | .ci/ci-configure.sh | 4 | ||||
-rwxr-xr-x | .ci/ci-make-benchmark.sh | 2 | ||||
-rwxr-xr-x | .ci/ci-make-check.sh | 4 | ||||
-rwxr-xr-x | .ci/ci-make-checkbuild.sh | 2 | ||||
-rwxr-xr-x | .ci/ci-make-distcheck.sh | 2 | ||||
-rwxr-xr-x | .ci/ci-make-examples.sh | 2 | ||||
-rwxr-xr-x | .ci/ci-make-install.sh | 2 | ||||
-rwxr-xr-x | .ci/ci-make.sh | 2 | ||||
-rw-r--r-- | .travis.yml | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh index 01a60ea749..8aebe8a78e 100755 --- a/.ci/ci-configure.sh +++ b/.ci/ci-configure.sh @@ -50,12 +50,12 @@ if [ "$DISTRO" != "" ] ; then fi docker exec $(cat $HOME/cid) sh -c 'rm -f ~/.ccache/ccache.conf' travis_fold autoreconf autoreconf - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ $(cat $HOME/cid) sh -c "autoreconf -iv" travis_endfold autoreconf travis_fold configure "configure $OPTS" - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ --env CXX="ccache g++" --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ $(cat $HOME/cid) sh -c "./configure $OPTS" travis_endfold configure diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh index 9005f482a9..d8357173e5 100755 --- a/.ci/ci-make-benchmark.sh +++ b/.ci/ci-make-benchmark.sh @@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then fi travis_fold benchmark "make benchmark" if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark else export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" make benchmark diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh index 38e00c1ac6..a753b156ef 100755 --- a/.ci/ci-make-check.sh +++ b/.ci/ci-make-check.sh @@ -13,8 +13,8 @@ fi travis_fold check "make check-TESTS" if [ "$DISTRO" != "" ] ; then for tries in 1 2 3 ; do - (docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log + (docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make -j2 -C src/ check-TESTS) && break + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) cat src/test-suite.log if [ $tries != 3 ] ; then echo "tests failed, trying again!" ; fi false done diff --git a/.ci/ci-make-checkbuild.sh b/.ci/ci-make-checkbuild.sh index aa19844b79..fab8a43635 100755 --- a/.ci/ci-make-checkbuild.sh +++ b/.ci/ci-make-checkbuild.sh @@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then fi travis_fold check-build "make check-build" if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make check-build else export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" make check-build diff --git a/.ci/ci-make-distcheck.sh b/.ci/ci-make-distcheck.sh index 79342749ca..f4e66dfbbe 100755 --- a/.ci/ci-make-distcheck.sh +++ b/.ci/ci-make-distcheck.sh @@ -7,7 +7,7 @@ if [ "$1" != "release-ready" ] ; then fi travis_fold distcheck "make distcheck" if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 --env CC="ccache gcc" \ --env CXX="ccache g++" \ --env CFLAGS="-fdirectives-only" --env CXXFLAGS="-fdirectives-only" \ $(cat $HOME/cid) make distcheck diff --git a/.ci/ci-make-examples.sh b/.ci/ci-make-examples.sh index 7b0a25c12f..6a59898083 100755 --- a/.ci/ci-make-examples.sh +++ b/.ci/ci-make-examples.sh @@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then fi travis_fold examples "make examples" if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make examples else export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" make examples diff --git a/.ci/ci-make-install.sh b/.ci/ci-make-install.sh index 0b2970533f..48f311bd6b 100755 --- a/.ci/ci-make-install.sh +++ b/.ci/ci-make-install.sh @@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then fi travis_fold install "make install" if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make install else export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" make install diff --git a/.ci/ci-make.sh b/.ci/ci-make.sh index bee5a17500..dbe1ab4352 100755 --- a/.ci/ci-make.sh +++ b/.ci/ci-make.sh @@ -7,7 +7,7 @@ if [ "$1" = "release-ready" ] ; then fi travis_fold make make if [ "$DISTRO" != "" ] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make else export PATH="$(brew --prefix gettext)/bin:$PATH" make diff --git a/.travis.yml b/.travis.yml index fa61e42884..e4d8cc9ca4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ os: env: global: - - MAKEFLAGS="-j5" + - MAKEFLAGS="-j5 -rR" - EIO_MONITOR_POLL=1 - CC="ccache gcc" - CXX="ccache g++" @@ -106,7 +106,7 @@ script: if [[ "$DISTRO" == "" ]] && [[ "$TRAVIS_OS_NAME" != "linux" ]] ; then true elif [[ "$CI_BUILD_TYPE" != "release-ready" ]] ; then - docker exec --env MAKEFLAGS="-j5" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh + docker exec --env MAKEFLAGS="-j5 -rR" --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) .ci/build-efl-app.sh fi before_cache: - .ci/ci-ccache-stats.sh |