diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-12-04 11:12:32 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-12-04 11:12:32 +0100 |
| commit | 9c5d84ace1daaf2dcd08c04b9c138940afdf5001 (patch) | |
| tree | 73d07056697eca83f29a80fc53392284963e3871 /run-tests.php | |
| parent | 52b41f24e32c2c3f503a90e4f9879babc945c8e7 (diff) | |
| parent | 4f9f7c7948d8c852a5038a4a8787cc8b6f465940 (diff) | |
| download | php-git-9c5d84ace1daaf2dcd08c04b9c138940afdf5001.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add initial install
switch to C travis project instead of PHP
use the generic TRAVIS environment var to check for travis (see http://docs.travis-ci.com/user/ci-environment/)
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index 7d7767f662..87a67768cc 100755 --- a/run-tests.php +++ b/run-tests.php @@ -314,7 +314,7 @@ VALGRIND : " . ($leak_check ? $valgrind_header : 'Not used') . " define('PHP_QA_EMAIL', 'qa-reports@lists.php.net'); define('QA_SUBMISSION_PAGE', 'http://qa.php.net/buildtest-process.php'); define('QA_REPORTS_PAGE', 'http://qa.php.net/reports'); -define('TRAVIS_CI' , (bool) getenv('TRAVIS_PHP_VERSION')); +define('TRAVIS_CI' , (bool) getenv('TRAVIS')); function save_or_mail_results() { |