From e87589e95af3d09fe7b10fb1fe174c1c4d135281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Noco=C5=84?= <mnocon@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:11:37 +0200
Subject: [PATCH] [Travis] Added things removed during merge-up

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 94cac25606..54d6364595 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,6 +82,7 @@ before_install:
   - ./bin/.travis/trusty/update_docker.sh
   # Internal auth token dedicated to testing with travis+composer on ezsystems repos, not for reuse!
   - echo "{\"github-oauth\":{\"github.com\":\"d0285ed5c8644f30547572ead2ed897431c1fc09\"}}" > auth.json
+  # Disable XDebug for performance
   - phpenv config-rm xdebug.ini
   # Get latest composer build
   - travis_retry composer selfupdate
@@ -97,6 +98,14 @@ before_script:
   - if [ "${SYMFONY_CMD}" != "" ] ; then docker-compose exec --user www-data app sh -c "bin/console ${SYMFONY_CMD}" ; fi
   - if [ "${SETUP_BEHAT_OPTS}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/ezbehat $SETUP_BEHAT_OPTS" ; fi
   #- docker ps
+  #- docker-compose logs
+
+# Execute test command, need to use sh to get right exit code (docker/compose/issues/3379)
+# Behat will use behat.yml which is a copy of behat.yml.dist with hostnames update by doc/docker/selenium.yml
+script:
+  - if [ "${TEST_CMD}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "$TEST_CMD" ; fi
+  - if [ "${BEHAT_OPTS}" != "" ] ; then cd "$HOME/build/ezplatform"; docker-compose exec --user www-data app sh -c "bin/ezbehat $BEHAT_OPTS" ; fi
+
 
 after_failure:
   # Will show us the last bit of the log of container's main processes