From 6e43046b0817df4f801f72ab6e0561cb4043d7cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 26 Feb 2014 11:53:46 +0100
Subject: [PATCH 1/2] Allow to pass additional args to phpunit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 7a0b38c066..f53e7a0b75 100644
--- a/build.xml
+++ b/build.xml
@@ -5,6 +5,7 @@
  <property name="source_comma_sep" value="."/>
  <property environment="env"/>
  <property name="env.PHPUNIT_XML" value="phpunit.xml.dist"/>
+ <property name="env.PHPUNIT_ARGS" value=""/>
 
  <target name="clean" description="Clean up and create artifact directories">
   <delete dir="${basedir}/build/api"/>
@@ -22,13 +23,13 @@
 
  <target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
   <exec executable="phpunit" failonerror="true">
-      <arg line="--configuration ${env.PHPUNIT_XML}"/>
+      <arg line="--configuration ${env.PHPUNIT_XML} ${env.PHPUNIT_ARGS}"/>
   </exec>
  </target>
 
  <target name="phpunit-nocoverage" description="Run unit tests using PHPUnit and generates junit.xml">
   <exec executable="phpunit" failonerror="true">
-      <arg line="--configuration phpunit.xml.nocoverage"/>
+      <arg line="--configuration phpunit.xml.nocoverage ${env.PHPUNIT_ARGS}"/>
   </exec>
  </target>
 

From e28e933ee65e37c1f04ded5c158bfdb625407f6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 26 Feb 2014 11:54:39 +0100
Subject: [PATCH 2/2] Run phpunit in debug mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This should produce output after each test preventing timeout errors on
travis.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7edb81d01..6451668d96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ before_script:
   - php composer.phar install --dev --no-interaction
 script:
   - ./scripts/generate-mo --quiet
-  - ant phpunit lint
+  - PHPUNIT_ARGS=--debug ant phpunit lint
   - if [[ $TRAVIS_PULL_REQUEST != "false" ]] ; then ./scripts/check-dco origin/$TRAVIS_BRANCH..FETCH_HEAD ; fi
 after_script:
   - php vendor/bin/coveralls -v