Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  run-tests: fixed exit code not being set on BORKED tests

diff --cc run-tests.php
index 21f9726f1e768e7a8d7aead6ef9560fee2e366e3,c68982889a7fa4c4a0201a3632ce9aa513f79960..34fc65e6c5b8861bf701178a5dc62b73517af1c9
--- 1/run-tests.php
--- 2/run-tests.php
+++ b/run-tests.php
@@@ -738,74 -716,91 +738,74 @@@ function main(): voi
          if ($output_file != '' && $just_save_results) {
              save_or_mail_results();
          }
 -
 -        junit_save_xml();
 -
 -        if (getenv('REPORT_EXIT_STATUS') !== '0' &&
 -            getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
 -            exit(1);
 +    } else {
 +        // Compile a list of all test files (*.phpt).
 +        $test_files = [];
 +        $exts_tested = count($exts_to_test);
 +        $exts_skipped = 0;
 +        $ignored_by_ext = 0;
 +        sort($exts_to_test);
 +        $test_dirs = [];
 +        $optionals = ['Zend', 'tests', 'ext', 'sapi'];
 +
 +        foreach ($optionals as $dir) {
 +            if (is_dir($dir)) {
 +                $test_dirs[] = $dir;
 +            }
          }
  
 -        return;
 -    }
 -
 -    verify_config();
 -    write_information();
 -
 -    // Compile a list of all test files (*.phpt).
 -    $test_files = array();
 -    $exts_tested = count($exts_to_test);
 -    $exts_skipped = 0;
 -    $ignored_by_ext = 0;
 -    sort($exts_to_test);
 -    $test_dirs = array();
 -    $optionals = array('Zend', 'tests', 'ext', 'sapi');
 -
 -    foreach ($optionals as $dir) {
 -        if (is_dir($dir)) {
 -            $test_dirs[] = $dir;
 +        // Convert extension names to lowercase
 +        foreach ($exts_to_test as $key => $val) {
 +            $exts_to_test[$key] = strtolower($val);
          }
 -    }
 -
 -    // Convert extension names to lowercase
 -    foreach ($exts_to_test as $key => $val) {
 -        $exts_to_test[$key] = strtolower($val);
 -    }
  
 -    foreach ($test_dirs as $dir) {
 -        find_files(TEST_PHP_SRCDIR . "/{$dir}", $dir == 'ext');
 -    }
 +        foreach ($test_dirs as $dir) {
 +            find_files(TEST_PHP_SRCDIR . "/{$dir}", $dir == 'ext');
 +        }
  
 -    foreach ($user_tests as $dir) {
 -        find_files($dir, $dir == 'ext');
 -    }
 +        foreach ($user_tests as $dir) {
 +            find_files($dir, $dir == 'ext');
 +        }
  
 -    $test_files = array_unique($test_files);
 -    usort($test_files, "test_sort");
 +        $test_files = array_unique($test_files);
 +        usort($test_files, "test_sort");
  
 -    $start_time = time();
 -    show_start($start_time);
 +        $start_time = time();
 +        show_start($start_time);
  
 -    $test_cnt = count($test_files);
 -    $test_idx = 0;
 -    run_all_tests($test_files, $environment);
 -    $end_time = time();
 +        $test_cnt = count($test_files);
 +        $test_idx = 0;
 +        run_all_tests($test_files, $environment);
 +        $end_time = time();
  
 -    if ($failed_tests_file) {
 -        fclose($failed_tests_file);
 -    }
 +        if ($failed_tests_file) {
 +            fclose($failed_tests_file);
 +        }
  
 -    if ($result_tests_file) {
 -        fclose($result_tests_file);
 -    }
 +        if ($result_tests_file) {
 +            fclose($result_tests_file);
 +        }
  
 -    // Summarize results
 +        // Summarize results
  
 -    if (0 == count($test_results)) {
 -        echo "No tests were run.\n";
 -        return;
 -    }
 +        if (0 == count($test_results)) {
 +            echo "No tests were run.\n";
 +            return;
 +        }
  
 -    compute_summary();
 +        compute_summary();
  
 -    show_end($end_time);
 -    show_summary();
 +        show_end($end_time);
 +        show_summary();
  
 -    if ($html_output) {
 -        fclose($html_file);
 +        save_or_mail_results();
      }
  
 -    save_or_mail_results();
 -
      junit_save_xml();
 -    if (getenv('REPORT_EXIT_STATUS') !== '0' &&
 -        getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
 +    if (getenv('REPORT_EXIT_STATUS') !== '0' && getenv('REPORT_EXIT_STATUS') !== 'no' &&
-             ($sum_results['FAILED'] || $sum_results['LEAKED'])) {
++            ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
          exit(1);
      }
 -    exit(0);
  }
  
  if (!function_exists("hrtime")) {