Merge branch 'develop-olympus' into develop

* develop-olympus:
  [task/travis] Exclude functional and slow tests
This commit is contained in:
Nils Adermann 2012-03-22 17:03:23 +01:00
commit aef9f31325
2 changed files with 12 additions and 0 deletions

View file

@ -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" />

View file

@ -16,6 +16,12 @@
</testsuite>
</testsuites>
<groups>
<exclude>
<group>slow</group>
</exclude>
</groups>
<php>
<!-- "Real" test database -->
<!-- uncomment, otherwise sqlite memory runs -->