diff options
| author | Matteo Beccati <mbeccati@php.net> | 2014-05-25 00:08:41 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2014-05-25 00:08:41 +0200 |
| commit | 370256ad4bf1e3d0c388911d3a75f693fe4ca5b0 (patch) | |
| tree | 80079fc064d2f571d6deddda0ffd91ab640607f8 /run-tests.php | |
| parent | 666197b8cc889af6ad0dd794405e138ff4fb2c34 (diff) | |
| parent | 980c63651c65f4078f627409781b6d66e5834088 (diff) | |
| download | php-git-370256ad4bf1e3d0c388911d3a75f693fe4ca5b0.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix broken Junit output with --disable-cgi
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php index 5230082519..030e95a684 100755 --- a/run-tests.php +++ b/run-tests.php @@ -1356,6 +1356,7 @@ TEST $file } else { show_result('SKIP', $tested, $tested_file, "reason: CGI not available"); + junit_init_suite(junit_get_suitename_for($shortname)); junit_mark_test_as('SKIP', $shortname, $tested, 0, 'CGI not available'); return 'SKIPPED'; } |