Skip to content

Commit

Permalink
Merge branch 'hotfix/4252' into develop
Browse files Browse the repository at this point in the history
weierophinney committed Apr 18, 2013
2 parents fd5c3ef + e3469bb commit 5a1bae6
Showing 1 changed file with 19 additions and 11 deletions.
30 changes: 19 additions & 11 deletions build.xml
Original file line number Diff line number Diff line change
@@ -16,11 +16,19 @@
</target>

<target name="composer-install" description="Installs dependencies via composer install">
<exec executable="composer" failonerror="true">
<arg value="install" />
<arg value="--dev" />
<arg value="--prefer-source" />
</exec>
<sequential>
<exec executable="composer" failonerror="true">
<arg value="self-update" />
</exec>
<exec executable="composer" failonerror="true">
<arg value="--version" />
</exec>
<exec executable="composer" failonerror="true">
<arg value="install" />
<arg value="--dev" />
<arg value="--prefer-source" />
</exec>
</sequential>
</target>

<target
@@ -102,12 +110,12 @@

</echo>
<exec
executable="${basedir}/vendor/bin/phpunit"
output="${basedir}/build/test-results/@{component}.log"
error="${basedir}/build/test-results/@{component}.log"
failonerror="true"
append="true"
>
executable="${basedir}/vendor/bin/phpunit"
output="${basedir}/build/test-results/@{component}.log"
error="${basedir}/build/test-results/@{component}.log"
failonerror="true"
append="true"
>
<arg value="-c" />
<arg value="${basedir}/tests/phpunit.xml.dist" />
<arg value="${basedir}/tests/ZendTest/@{component}" />

0 comments on commit 5a1bae6

Please sign in to comment.