From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Fri, 8 Nov 2019 19:36:55 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d529757f84cb81d5eba53e77e8395efe4e54334;p=php

Merge branch 'PHP-7.4'
---

4d529757f84cb81d5eba53e77e8395efe4e54334
diff --cc run-tests.php
index ee1b380832,07e3d2d797..2863fd709e
--- a/run-tests.php
+++ b/run-tests.php
@@@ -652,81 -649,81 +649,81 @@@ HELP
  				}
  			}
  		}
+ 	}
  
- 		// Default to PHP_BINARY as executable
- 		if (!isset($environment['TEST_PHP_EXECUTABLE'])) {
- 			$php = PHP_BINARY;
- 			putenv("TEST_PHP_EXECUTABLE=$php");
- 			$environment['TEST_PHP_EXECUTABLE'] = $php;
- 		}
+ 	// Default to PHP_BINARY as executable
+ 	if (!isset($environment['TEST_PHP_EXECUTABLE'])) {
+ 		$php = PHP_BINARY;
+ 		putenv("TEST_PHP_EXECUTABLE=$php");
+ 		$environment['TEST_PHP_EXECUTABLE'] = $php;
+ 	}
  
- 		if (strlen($conf_passed)) {
- 			if (IS_WINDOWS) {
- 				$pass_options .= " -c " . escapeshellarg($conf_passed);
- 			} else {
- 				$pass_options .= " -c '" . realpath($conf_passed) . "'";
- 			}
+ 	if (strlen($conf_passed)) {
 -		if (substr(PHP_OS, 0, 3) == "WIN") {
++		if (IS_WINDOWS) {
+ 			$pass_options .= " -c " . escapeshellarg($conf_passed);
+ 		} else {
+ 			$pass_options .= " -c '" . realpath($conf_passed) . "'";
  		}
+ 	}
  
- 		$test_files = array_unique($test_files);
- 		$test_files = array_merge($test_files, $redir_tests);
- 
- 		// Run selected tests.
- 		$test_cnt = count($test_files);
+ 	$test_files = array_unique($test_files);
+ 	$test_files = array_merge($test_files, $redir_tests);
  
- 		if ($test_cnt) {
- 			putenv('NO_INTERACTION=1');
- 			verify_config();
- 			write_information();
- 			usort($test_files, "test_sort");
- 			$start_time = time();
+ 	// Run selected tests.
+ 	$test_cnt = count($test_files);
  
- 			if (!$html_output) {
- 				echo "Running selected tests.\n";
- 			} else {
- 				show_start($start_time);
- 			}
+ 	if ($test_cnt) {
+ 		putenv('NO_INTERACTION=1');
+ 		verify_config();
+ 		write_information();
+ 		usort($test_files, "test_sort");
+ 		$start_time = time();
  
- 			$test_idx = 0;
- 			run_all_tests($test_files, $environment);
- 			$end_time = time();
+ 		if (!$html_output) {
+ 			echo "Running selected tests.\n";
+ 		} else {
+ 			show_start($start_time);
+ 		}
  
- 			if ($html_output) {
- 				show_end($end_time);
- 			}
+ 		$test_idx = 0;
+ 		run_all_tests($test_files, $environment);
+ 		$end_time = time();
  
- 			if ($failed_tests_file) {
- 				fclose($failed_tests_file);
- 			}
+ 		if ($html_output) {
+ 			show_end($end_time);
+ 		}
  
- 			if ($result_tests_file) {
- 				fclose($result_tests_file);
- 			}
+ 		if ($failed_tests_file) {
+ 			fclose($failed_tests_file);
+ 		}
  
- 			compute_summary();
- 			if ($html_output) {
- 				fwrite($html_file, "<hr/>\n" . get_summary(false, true));
- 			}
- 			echo "=====================================================================";
- 			echo get_summary(false, false);
+ 		if ($result_tests_file) {
+ 			fclose($result_tests_file);
+ 		}
  
- 			if ($html_output) {
- 				fclose($html_file);
- 			}
+ 		compute_summary();
+ 		if ($html_output) {
+ 			fwrite($html_file, "<hr/>\n" . get_summary(false, true));
+ 		}
+ 		echo "=====================================================================";
+ 		echo get_summary(false, false);
  
- 			if ($output_file != '' && $just_save_results) {
- 				save_or_mail_results();
- 			}
+ 		if ($html_output) {
+ 			fclose($html_file);
+ 		}
  
- 			junit_save_xml();
+ 		if ($output_file != '' && $just_save_results) {
+ 			save_or_mail_results();
+ 		}
  
- 			if (getenv('REPORT_EXIT_STATUS') !== '0' &&
- 				getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
- 				exit(1);
- 			}
+ 		junit_save_xml();
  
- 			return;
+ 		if (getenv('REPORT_EXIT_STATUS') !== '0' &&
+ 			getenv('REPORT_EXIT_STATUS') !== 'no' && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
+ 			exit(1);
  		}
+ 
+ 		return;
  	}
  
  	verify_config();