From ead6193504d4f742ff2adc9e5445a2d16fcddf7d Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <s.schmidt@samsung.com>
Date: Tue, 2 Jun 2020 16:03:00 +0200
Subject: [PATCH] ci: travis: add more fold and timing markers in some
 forgotten places

In teh initial patch we forgot some interesting places we also want to
fold and get timing info on. Dependency installation, cross native build
step, coverity tools download and codecov run.

Differential Revision: https://phab.enlightenment.org/D11938
---
 .ci/ci-configure.sh               |  8 ++++++--
 .ci/ci-make-check.sh              |  8 ++++++--
 .ci/ubuntu-bionic-install-deps.sh | 11 ++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 7b75272fb4..b19f07e5cb 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -51,14 +51,18 @@ if [ "$DISTRO" != "" ] ; then
   elif [ "$1" = "release-ready" ]; then
     OPTS="$OPTS $RELEASE_READY_LINUX_COPTS"
   elif [ "$1" = "coverity" ]; then
-    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
     travis_fold start "cov-download"
+    travis_time_start "cov-download"
+    OPTS="$OPTS $WAYLAND_LINUX_COPTS"
     docker exec --env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN $(cat $HOME/cid) sh -c '.ci/coverity-tools-install.sh'
+    travis_time_finish "cov-download"
     travis_fold end "cov-download"
   elif [ "$1" = "mingw" ]; then
-    OPTS="$OPTS $MINGW_COPTS"
     travis_fold start "cross-native"
+    travis_time_start "cross-native"
+    OPTS="$OPTS $MINGW_COPTS"
     docker exec $(cat $HOME/cid) sh -c '.ci/bootstrap-efl-native-for-cross.sh'
+    travis_time_finish "cross-native"
     travis_fold end "cross-native"
   fi
 
diff --git a/.ci/ci-make-check.sh b/.ci/ci-make-check.sh
index ffdb56ab7f..17fedfea65 100755
--- a/.ci/ci-make-check.sh
+++ b/.ci/ci-make-check.sh
@@ -8,9 +8,9 @@ fi
 
 NUM_TRIES=5
 
-travis_fold start "ninja-test"
-travis_time_start "ninja-test"
 if [ "$1" = "codecov" ] ; then
+  travis_fold start "codecov"
+  travis_time_start "codecov"
   for tries in $(seq 1 ${NUM_TRIES}); do
     export EFL_TEST_ECORE_CON_IPV6=1
     meson test -t 120 -C build --wrapper dbus-launch && break
@@ -19,9 +19,13 @@ if [ "$1" = "codecov" ] ; then
       false
   done
   curl -s https://codecov.io/bash | bash -s -
+  travis_time_finish "codecov"
+  travis_fold end "codecov"
   exit 0
 fi
 
+travis_fold start "ninja-test"
+travis_time_start "ninja-test"
 if [ "$DISTRO" != "" ] ; then
   for tries in $(seq 1 ${NUM_TRIES}); do
     (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
diff --git a/.ci/ubuntu-bionic-install-deps.sh b/.ci/ubuntu-bionic-install-deps.sh
index 3f08287df1..008304a15f 100755
--- a/.ci/ubuntu-bionic-install-deps.sh
+++ b/.ci/ubuntu-bionic-install-deps.sh
@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+set -e
+
+travis_fold start "bionic-deps"
+travis_time_start "bionic-deps"
+
 sudo apt-get update -y
 sudo apt-get install -y build-essential autoconf automake autopoint doxygen check libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd ccache git binutils-gold python3-pip ninja-build dbus-x11 libavahi-client-dev python3-setuptools libopenjp2-7-dev libc6-dev libpcre3-dev
 # s390x on Ubuntu Bionic on Travis does not have a luajit package and fails install, use lua5.1
@@ -8,3 +14,6 @@ else
   sudo apt-get install -y luajit libluajit-5.1-dev
 fi
 sudo pip3 install meson
+
+travis_time_finish "bionic-deps"
+travis_fold end "bionic-deps"