diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:03:23 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-22 17:03:23 +0100 |
| commit | aef9f31325d66a4fe0b365fdde0ffbeff53a2273 (patch) | |
| tree | 12c4468bdb6ec5d2cbcaac5bc6c91f2de059890b | |
| parent | b3169b376f1c75e75e97dcdba34e1d214b40c2e1 (diff) | |
| parent | 992b58d4685dabf04636d80fd5aa09f6ff10ed45 (diff) | |
| download | forums-aef9f31325d66a4fe0b365fdde0ffbeff53a2273.tar forums-aef9f31325d66a4fe0b365fdde0ffbeff53a2273.tar.gz forums-aef9f31325d66a4fe0b365fdde0ffbeff53a2273.tar.bz2 forums-aef9f31325d66a4fe0b365fdde0ffbeff53a2273.tar.xz forums-aef9f31325d66a4fe0b365fdde0ffbeff53a2273.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[task/travis] Exclude functional and slow tests
| -rw-r--r-- | travis/phpunit-mysql-travis.xml | 6 | ||||
| -rw-r--r-- | travis/phpunit-postgres-travis.xml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 807dfbcdaa..79215c8de1 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -16,6 +16,12 @@ </testsuite> </testsuites> + <groups> + <exclude> + <group>slow</group> + </exclude> + </groups> + <php> <const name="dbms" value="mysqli"/> <const name="dbhost" value="0.0.0.0" /> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index e44696a335..02db76ae78 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -16,6 +16,12 @@ </testsuite> </testsuites> + <groups> + <exclude> + <group>slow</group> + </exclude> + </groups> + <php> <!-- "Real" test database --> <!-- uncomment, otherwise sqlite memory runs --> |