1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-11 03:17:43 +01:00

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
This commit is contained in:
Nathaniel Guse 2013-07-12 14:07:43 -05:00
commit 91672b6d56
3 changed files with 12 additions and 0 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>