diff options
author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:21:58 -0500 |
---|---|---|
committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:21:58 -0500 |
commit | b1b37ddde2ddf6bae5d64e634f070c7f7afd251f (patch) | |
tree | 01dbf1c50aaafffb5a23f1454274d828cc977de2 | |
parent | 2b69715e2103ec32fdf09beff3beb7097ebf2c2c (diff) | |
parent | 3375f41ef1eaca8edca344372a31d4aafb739c87 (diff) | |
download | forums-b1b37ddde2ddf6bae5d64e634f070c7f7afd251f.tar forums-b1b37ddde2ddf6bae5d64e634f070c7f7afd251f.tar.gz forums-b1b37ddde2ddf6bae5d64e634f070c7f7afd251f.tar.bz2 forums-b1b37ddde2ddf6bae5d64e634f070c7f7afd251f.tar.xz forums-b1b37ddde2ddf6bae5d64e634f070c7f7afd251f.zip |
Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into develop-olympus
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11668-travis:
[ticket/11668] Move lint test to the end for travis
-rw-r--r-- | travis/phpunit-mysql-travis.xml | 4 | ||||
-rw-r--r-- | travis/phpunit-postgres-travis.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 179a2a358e..e99f8d6cee 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -15,6 +15,10 @@ <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">../tests/</directory> <exclude>tests/functional</exclude> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 12e20547ba..3d1b574716 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -15,6 +15,10 @@ <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">../tests/</directory> <exclude>tests/functional</exclude> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> <testsuite name="phpBB Functional Tests"> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> |