summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-05-25 00:08:56 +0200
committerMatteo Beccati <mbeccati@php.net>2014-05-25 00:08:56 +0200
commit2c8ce5ba17acec00a124f0d3100d3525e098f997 (patch)
treef1585634bfdebc192c8efe52caa68f1afe698eb5
parentdc8a53d4baeb2a4c97b367b78b3d47b53fe6ecbb (diff)
parent370256ad4bf1e3d0c388911d3a75f693fe4ca5b0 (diff)
downloadphp-git-2c8ce5ba17acec00a124f0d3100d3525e098f997.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Fix broken Junit output with --disable-cgi
-rwxr-xr-xrun-tests.php1
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';
}