Merge branch 'PHP-5.5' into PHP-5.6

mbeccati · mbeccati · commit 370256ad4bf1 · 2014-05-25T00:08:41.000+02:00
* PHP-5.5:
  Fix broken Junit output with --disable-cgi
diff --git a/run-tests.php b/run-tests.php
@@ -1356,6 +1356,7 @@ function run_test($php, $file, $env)
 			} 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';
 			}

Original file line number	Diff line number	Diff line change
`@@ -1356,6 +1356,7 @@ function run_test($php, $file, $env)`
`1356`	`1356`	`} else {`
`1357`	`1357`	`show_result('SKIP', $tested, $tested_file, "reason: CGI not available");`
`1358`	`1358`
	`1359`	`+ junit_init_suite(junit_get_suitename_for($shortname));`
`1359`	`1360`	`junit_mark_test_as('SKIP', $shortname, $tested, 0, 'CGI not available');`
`1360`	`1361`	`return 'SKIPPED';`
`1361`	`1362`	`}`