aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-03-22 17:03:03 +0100
committerNils Adermann <naderman@naderman.de>2012-03-22 17:03:03 +0100
commit992b58d4685dabf04636d80fd5aa09f6ff10ed45 (patch)
tree1e534e73053f24c7c0132b9593342146a3d6c480
parent6f809416bae81967d2e59c2354fb552d427b031f (diff)
parent0ed66ad0e8d11c802520046b446aa5622a637df9 (diff)
downloadforums-992b58d4685dabf04636d80fd5aa09f6ff10ed45.tar
forums-992b58d4685dabf04636d80fd5aa09f6ff10ed45.tar.gz
forums-992b58d4685dabf04636d80fd5aa09f6ff10ed45.tar.bz2
forums-992b58d4685dabf04636d80fd5aa09f6ff10ed45.tar.xz
forums-992b58d4685dabf04636d80fd5aa09f6ff10ed45.zip
Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis: [task/travis] Exclude functional and slow tests
-rw-r--r--travis/phpunit-mysql-travis.xml6
-rw-r--r--travis/phpunit-postgres-travis.xml6
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 -->