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 | |
| parent | 6c8bfcdef639a763675f9c9872b7e887d7a4f57a (diff) | |
| parent | 72b06c711ae8d5662fefec3f768d0b457ea63bc2 (diff) | |
| download | forums-91672b6d561d2122b509b83bea3f13699c2bab87.tar forums-91672b6d561d2122b509b83bea3f13699c2bab87.tar.gz forums-91672b6d561d2122b509b83bea3f13699c2bab87.tar.bz2 forums-91672b6d561d2122b509b83bea3f13699c2bab87.tar.xz forums-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
| -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 3639843771..d47864e104 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -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> 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> diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 99f11477aa..3a3d653b47 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -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> |