Permalink
Browse files

Merge branch 'pulls/phpunit-composer' into 3.0

  • Loading branch information...
2 parents 8347a7f + e07ae20 commit 4e1e09de753399d336939b2b23b68e132f973c53 @chillu chillu committed Nov 15, 2012
Showing with 17 additions and 2 deletions.
  1. +14 −0 build.xml
  2. +3 −2 composer.json
View
@@ -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"
description="Creates a new git tag in all the nested working copies (optionally pushes the created tag)"
depends="_gitRepositories,_gitBinary">
View
@@ -9,7 +9,8 @@
},
"require-dev": {
"silverstripe/compass": "*",
- "silverstripe/docsviewer": "*"
+ "silverstripe/docsviewer": "*",
+ "phpunit/phpunit": "3.7.*"
},
"minimum-stability": "dev"
-}
+}

0 comments on commit 4e1e09d

Please sign in to comment.