makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12962] Use phpVersion in phpunit.xml

Browse source 
PHPBB3-12962
This commit is contained in:
Dhruv 2014-10-27 08:13:41 -07:00
parent c6cca9d0d2
commit cc82f95c8f
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -43,4 +43,3 @@ script:
- travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./
- phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
- kill -9 `pidof phantomjs`

3
phpunit.xml.dist
View file

@ -25,7 +25,8 @@
<file>./tests/lint_test.php</file> <file>./tests/lint_test.php</file>
</testsuite> </testsuite>
<testsuite name="phpBB UI Tests"> <testsuite name="phpBB UI Tests">
<directory suffix="_test.php">./tests/ui</directory> <directory suffix="_test.php" phpVersion="5.3.19"
phpVersionOperator=">=">./tests/ui</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>

2
tests/bootstrap.php
View file

@ -34,7 +34,7 @@ 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'; require_once 'test_framework/phpbb_functional_test_case.php';
if (version_compare(PHP_VERSION,'5.3.19',">=")) if (version_compare(PHP_VERSION,'5.3.19', ">="))
{ {
require_once 'test_framework/phpbb_ui_test_case.php'; require_once 'test_framework/phpbb_ui_test_case.php';
} }