diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-08-07 21:34:46 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-08-07 21:34:46 -0400 |
| commit | 55e4dfd3bd10029b5d3b4f5f0037a18517e4017d (patch) | |
| tree | 560024976959e15e8c0c9e6b77ae658b99ef2704 /build | |
| parent | 35b0badcf31c41b9ad62bc988a8e067bb7a15469 (diff) | |
| parent | b85cd7a431894e851d40e4fdf0611a0029b3ec50 (diff) | |
| download | forums-55e4dfd3bd10029b5d3b4f5f0037a18517e4017d.tar forums-55e4dfd3bd10029b5d3b4f5f0037a18517e4017d.tar.gz forums-55e4dfd3bd10029b5d3b4f5f0037a18517e4017d.tar.bz2 forums-55e4dfd3bd10029b5d3b4f5f0037a18517e4017d.tar.xz forums-55e4dfd3bd10029b5d3b4f5f0037a18517e4017d.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10313] Create a separate build task for slow tests.
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/build/build.xml b/build/build.xml index b59b8f65cc..7cfb5d0bf8 100644 --- a/build/build.xml +++ b/build/build.xml @@ -46,23 +46,19 @@ <target name="test" depends="clean,prepare"> <exec dir="." command="phpunit --log-junit build/logs/phpunit.xml - --configuration phpunit.xml.all --coverage-clover build/logs/clover.xml --coverage-html build/coverage" passthru="true" /> + </target> - - <!-- Does not allow changing the working directory to tests/ - so this approach does not work for us unfortunately - <phpunit codecoverage="true" haltonfailure="true"> - <formatter todir="build/logs" type="xml"/> - <batchtest> - <fileset dir="tests"> - <include name="all_tests.php"/> - </fileset> - </batchtest> - </phpunit> - --> + <target name="test-slow" depends="clean,prepare"> + <exec dir="." + command="phpunit --log-junit build/logs/phpunit.xml + --configuration phpunit.xml.all + --group slow + --coverage-clover build/logs/clover-slow.xml + --coverage-html build/coverage-slow" + passthru="true" /> </target> <target name="docs"> |