ci: enable benchmark target again

It only runs after efl is installed and we need to ensure running with
Elm buffer engine in our docker build for the graphical collection
benchmark.

Signed-off-by: Stefan Schmidt <s.schmidt@samsung.com>
Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D10848

2 files changed, 9 insertions, 18 deletions

diff --git a/.ci/ci-make-benchmark.sh b/.ci/ci-make-benchmark.sh
index 1fe0f9796f..17455c1e52 100755
--- a/.ci/ci-make-benchmark.sh
+++ b/.ci/ci-make-benchmark.sh
@@ -2,20 +2,14 @@
 
 set -e
 . .ci/travis.sh
-if [ "$1" = "release-ready" ] ; then
-  exit 0
-fi
-if [ "$1" = "coverity" ] ; then
+if [ "$1" != "default" ] ; then
   exit 0
 fi
 travis_fold benchmark "ninja benchmark"
-echo "Nothing to do here, the benchmarks don't seem to terminate"
-#else
-  #if [ "$DISTRO" != "" ] ; then
-    #docker exec --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
-  #fi
-#fi
+if [ "$DISTRO" != "" ] ; then
+  docker exec --env EIO_MONITOR_POLL=1 --env ELM_ENGINE=buffer $(cat $HOME/cid) ninja benchmark -C build
+else
+  export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
+  ninja benchmark -C build
+fi
 travis_endfold benchmark
diff --git a/.travis.yml b/.travis.yml
index 587dbe939d..1b77b81bc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,15 +103,12 @@ script:
   - .ci/ci-configure.sh "$CI_BUILD_TYPE"
   - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
   - .ci/ci-make.sh "$CI_BUILD_TYPE"
-  - |
-      if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_BUILD_TYPE" == "" ]]; then
-          .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
-      fi
   - .ci/ci-make-install.sh "$CI_BUILD_TYPE"
+  - .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
   - .ci/ci-make-check.sh "$CI_BUILD_TYPE"
   - .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE"
-  - |
   - .ci/ci-build-test.sh "$CI_BUILD_TYPE"
+
 before_cache:
   - .ci/ci-ccache-stats.sh
   - |