summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2016-11-27 10:08:04 +0100
committerMatteo Beccati <mbeccati@php.net>2016-11-27 10:08:04 +0100
commitf9b158df0786df2583f3a683952009470f2df0af (patch)
tree1d104d694c67119f98dd50be91f6a27736f1f63c
parent343c0567729f57fc880600c65499a6bbf43277e6 (diff)
parent28cf42568b3cfba8dffd3760a9781b2eb8872a3d (diff)
downloadphp-git-f9b158df0786df2583f3a683952009470f2df0af.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Added missing array key to $JUNIT
-rwxr-xr-xrun-tests.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/run-tests.php b/run-tests.php
index fef39c50b8..c6ff35e7cc 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2734,6 +2734,7 @@ function junit_init() {
'test_fail' => 0,
'test_error' => 0,
'test_skip' => 0,
+ 'test_warn' => 0,
'execution_time'=> 0,
'suites' => array(),
'files' => array()