makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/unknownbliss/10719' into develop

Browse source 
* ticket/unknownbliss/10719:
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
This commit is contained in:
Nils Adermann 2012-03-22 16:36:06 +01:00
commit b3169b376f
4 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpunit.xml.all
View file

@ -14,10 +14,6 @@
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <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> </testsuite>
</testsuites> </testsuites>

4
phpunit.xml.dist
View file

@ -14,10 +14,6 @@
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <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> </testsuite>
</testsuites> </testsuites>

4
phpunit.xml.functional
View file

@ -14,10 +14,6 @@
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <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> </testsuite>
</testsuites> </testsuites>

6
tests/bootstrap.php
View file

@ -25,8 +25,4 @@ require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_test_case.php';
require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php';
require_once 'test_framework/phpbb_database_test_connection_manager.php'; require_once 'test_framework/phpbb_database_test_connection_manager.php';
require_once 'test_framework/phpbb_functional_test_case.php';
if (version_compare(PHP_VERSION, '5.3.0-dev', '>='))
{
require_once 'test_framework/phpbb_functional_test_case.php';
}