summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-11-15 09:29:24 +0100
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-12-18 09:15:54 +0100
commit9fb1ae0d3c1cd99ed8e81e4a54cae9216a72c7e0 (patch)
tree87d1f20656eb3ba8a93b9b44765ba492568c5872
parent2bd801f8599926b95ff8dd241a87703ff8eb16f5 (diff)
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
-rwxr-xr-x.ci/ci-make-benchmark.sh20
-rw-r--r--.travis.yml7
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 @@
2 2
3set -e 3set -e
4. .ci/travis.sh 4. .ci/travis.sh
5if [ "$1" = "release-ready" ] ; then 5if [ "$1" != "default" ] ; then
6 exit 0
7fi
8if [ "$1" = "coverity" ] ; then
9 exit 0 6 exit 0
10fi 7fi
11travis_fold benchmark "ninja benchmark" 8travis_fold benchmark "ninja benchmark"
12echo "Nothing to do here, the benchmarks don't seem to terminate" 9if [ "$DISTRO" != "" ] ; then
13#else 10 docker exec --env EIO_MONITOR_POLL=1 --env ELM_ENGINE=buffer $(cat $HOME/cid) ninja benchmark -C build
14 #if [ "$DISTRO" != "" ] ; then 11else
15 #docker exec --env EIO_MONITOR_POLL=1 $(cat $HOME/cid) make benchmark 12 export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH"
16 #else 13 ninja benchmark -C build
17 #export PATH="/usr/local/opt/ccache/libexec:$(brew --prefix gettext)/bin:$PATH" 14fi
18 #make benchmark
19 #fi
20#fi
21travis_endfold benchmark 15travis_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:
103 - .ci/ci-configure.sh "$CI_BUILD_TYPE" 103 - .ci/ci-configure.sh "$CI_BUILD_TYPE"
104 - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE" 104 - .ci/ci-setup-ccache.sh "$CI_BUILD_TYPE"
105 - .ci/ci-make.sh "$CI_BUILD_TYPE" 105 - .ci/ci-make.sh "$CI_BUILD_TYPE"
106 - |
107 if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_BUILD_TYPE" == "" ]]; then
108 .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
109 fi
110 - .ci/ci-make-install.sh "$CI_BUILD_TYPE" 106 - .ci/ci-make-install.sh "$CI_BUILD_TYPE"
107 - .ci/ci-make-benchmark.sh "$CI_BUILD_TYPE"
111 - .ci/ci-make-check.sh "$CI_BUILD_TYPE" 108 - .ci/ci-make-check.sh "$CI_BUILD_TYPE"
112 - .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE" 109 - .ci/ci-make-distcheck.sh "$CI_BUILD_TYPE"
113 - |
114 - .ci/ci-build-test.sh "$CI_BUILD_TYPE" 110 - .ci/ci-build-test.sh "$CI_BUILD_TYPE"
111
115before_cache: 112before_cache:
116 - .ci/ci-ccache-stats.sh 113 - .ci/ci-ccache-stats.sh
117 - | 114 - |