diff options
| author |   Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:07:43 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:07:43 -0500 |
| commit | 91672b6d561d2122b509b83bea3f13699c2bab87 (patch) | |
| tree | a39c9580b086e0a298eeb82f9765b1eb9e065219 /phpunit.xml.dist | |
| parent | Merge remote-tracking branch 'EXreaction/ticket/11669' into develop (diff) | |
| parent | Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympus (diff) | |
| download | phpbb-91672b6d561d2122b509b83bea3f13699c2bab87.tar.gz phpbb-91672b6d561d2122b509b83bea3f13699c2bab87.tar.bz2 phpbb-91672b6d561d2122b509b83bea3f13699c2bab87.zip | |
Merge branch 'develop-olympus' into develop
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11668] Run lint test at the end of the test suite
Conflicts:
phpunit.xml.all
phpunit.xml.dist
phpunit.xml.functional
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index f1cb4b9d09..ac45597b45 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,10 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> </testsuites> |