tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 15:05:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pulls/phpunit-composer' into 3.0

Browse Source
This commit is contained in:
Ingo Schommer 2012-11-15 17:06:23 +01:00
commit 4e1e09de75
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.xml
View File

@ -119,6 +119,20 @@ Options:
================================================================= =================================================================
--> -->
<target name="phpunit"
description="Runs unit tests as defined through phpunix.xml. Requires the 'phpunit' binary.">
<if>
<available file="${basedir}/vendor/bin/phpunit" />
<then>
<property name="phpunit_bin" value="vendor/bin/phpunit" />
</then>
<else>
<property name="phpunit_bin" value="phpunit" />
</else>
</if>
<exec command="${phpunit_bin}" checkreturn="true" passthru="true" />
</target>
<target name="tag" if="basedir" <target name="tag" if="basedir"
description="Creates a new git tag in all the nested working copies (optionally pushes the created tag)" description="Creates a new git tag in all the nested working copies (optionally pushes the created tag)"
depends="_gitRepositories,_gitBinary"> depends="_gitRepositories,_gitBinary">

5
composer.json
View File

@ -9,7 +9,8 @@
}, },
"require-dev": { "require-dev": {
"silverstripe/compass": "*", "silverstripe/compass": "*",
"silverstripe/docsviewer": "*" "silverstripe/docsviewer": "*",
"phpunit/phpunit": "3.7.*"
}, },
"minimum-stability": "dev" "minimum-stability": "dev"
} }