diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-23 11:43:54 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-23 11:43:54 +0100 |
| commit | e35aecb9bd051b46a804366cf461d426dc062404 (patch) | |
| tree | 368f0e9b4870ba7e41dac2c21d304e64f595d03e /phpunit.xml.functional | |
| parent | baefbdb8825a37051a200203a0191d34caa12229 (diff) | |
| parent | cc13bac412442a1d72affcc3222b6bfca094e92a (diff) | |
| download | forums-e35aecb9bd051b46a804366cf461d426dc062404.tar forums-e35aecb9bd051b46a804366cf461d426dc062404.tar.gz forums-e35aecb9bd051b46a804366cf461d426dc062404.tar.bz2 forums-e35aecb9bd051b46a804366cf461d426dc062404.tar.xz forums-e35aecb9bd051b46a804366cf461d426dc062404.zip | |
Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher
* upstream/develop: (30 commits)
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
[task/travis] Adding Travis Continuous Intergration Support
[ticket/10704] minor typo in a comment
[ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
[ticket/10691] Fixed the speed of creating search index
[task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
[task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
[task/php54] Refactor error_reporting call slightly.
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
[ticket/10689] Fix "First character"-option in "Find a member"-search
...
Diffstat (limited to 'phpunit.xml.functional')
| -rw-r--r-- | phpunit.xml.functional | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 91d569e65b..9facbcff8b 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -14,10 +14,6 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> - <exclude>./tests/functional</exclude> - </testsuite> - <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory> </testsuite> </testsuites> |