diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-10-27 08:13:41 -0700 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-10-27 08:13:41 -0700 |
| commit | cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316 (patch) | |
| tree | 5cf9ecc78ee20924a8c29e3d32ac7c7dfa8a53e7 | |
| parent | c6cca9d0d258fdbe832bba5d40a6e044e90ff873 (diff) | |
| download | forums-cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316.tar forums-cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316.tar.gz forums-cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316.tar.bz2 forums-cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316.tar.xz forums-cc82f95c8fd46c68dcd87334e37d3bfcd1d7c316.zip | |
[ticket/12962] Use phpVersion in phpunit.xml
PHPBB3-12962
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | phpunit.xml.dist | 3 | ||||
| -rw-r--r-- | tests/bootstrap.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index b44a3deedb..1eb7c56236 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,4 +43,3 @@ script: - travis/check-executable-files.sh $DB $TRAVIS_PHP_VERSION ./ - 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" - - kill -9 `pidof phantomjs` diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a497717107..bcc63d6fd9 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -25,7 +25,8 @@ <file>./tests/lint_test.php</file> </testsuite> <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> </testsuites> diff --git a/tests/bootstrap.php b/tests/bootstrap.php index c635a3abf4..65447eb95c 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -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_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'; } |