Merge branch 'PHP-7.3' into PHP-7.4

cmb69 · cmb69 · commit 67bb06cc9b2f · 2021-02-23T13:15:30.000+01:00
* PHP-7.3:
  run-tests: fixed exit code not being set on BORKED tests
diff --git a/run-tests.php b/run-tests.php
@@ -797,7 +797,7 @@ function main()
 
     junit_save_xml();
     if (getenv('REPORT_EXIT_STATUS') !== '0' &&
-        getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['LEAKED'])) {
+        getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
         exit(1);
     }
     exit(0);

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ function main()`
`797`	`797`
`798`	`798`	`junit_save_xml();`
`799`	`799`	`if (getenv('REPORT_EXIT_STATUS') !== '0' &&`
`800`		`- getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] \|\| $sum_results['LEAKED'])) {`
	`800`	`+ getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] \|\| $sum_results['BORKED'] \|\| $sum_results['LEAKED'])) {`
`801`	`801`	`exit(1);`
`802`	`802`	`}`
`803`	`803`	`exit(0);`