diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:04:31 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:04:31 -0500 |
| commit | 72b06c711ae8d5662fefec3f768d0b457ea63bc2 (patch) | |
| tree | c5756e898e1fb4ff3da459b2aeb5f17c9228be75 | |
| parent | 67c10ca622139ad5227e32153b44765a58f497d1 (diff) | |
| parent | a1a5a636b17f14fb3c09febe0607782f99cc7db1 (diff) | |
| download | forums-72b06c711ae8d5662fefec3f768d0b457ea63bc2.tar forums-72b06c711ae8d5662fefec3f768d0b457ea63bc2.tar.gz forums-72b06c711ae8d5662fefec3f768d0b457ea63bc2.tar.bz2 forums-72b06c711ae8d5662fefec3f768d0b457ea63bc2.tar.xz forums-72b06c711ae8d5662fefec3f768d0b457ea63bc2.zip | |
Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympus
# By Igor Wiedler
# Via Igor Wiedler
* remotes/igorw/ticket/11668:
[ticket/11668] Run lint test at the end of the test suite
| -rw-r--r-- | phpunit.xml.all | 4 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | phpunit.xml.functional | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/phpunit.xml.all b/phpunit.xml.all index 9e220ff559..d91a614c97 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -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.0" phpVersionOperator=">=">./tests/functional</directory> diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f8bf063d9a..4c91f8e373 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -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.0" phpVersionOperator=">=">./tests/functional</directory> diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 376d52e6d8..919de74dec 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -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.0" phpVersionOperator=">=">./tests/functional</directory> |