Merge branch 'PHP-7.4'

Author: nikic

run-tests.php

@@ -53,7 +53,7 @@ function main()
 		   $repeat, $result_tests_file, $slow_min_ms, $start_time, $switch,
 		   $temp_source, $temp_target, $temp_urlbase, $test_cnt, $test_dirs,
 		   $test_files, $test_idx, $test_list, $test_results, $testfile,
-		   $user_tests, $valgrind, $sum_results;
+		   $user_tests, $valgrind, $sum_results, $shuffle;
 	// Parallel testing
 	global $workers, $workerID;
 
@@ -320,6 +320,7 @@ function main()
 	$no_clean = false;
 	$slow_min_ms = INF;
 	$preload = false;
+	$shuffle = false;
 	$workers = null;
 
 	$cfgtypes = array('show', 'keep');
@@ -502,6 +503,9 @@ function main()
 					case '--offline':
 						$environment['SKIP_ONLINE_TESTS'] = 1;
 						break;
+					case '--shuffle':
+						$shuffle = true;
+						break;
 					//case 'w'
 					case '-':
 						// repeat check with full switch
@@ -1333,7 +1337,7 @@ function run_all_tests($test_files, $env, $redir_tested = null)
 
 /** The heart of parallel testing. */
 function run_all_tests_parallel($test_files, $env, $redir_tested) {
-	global $workers, $test_idx, $test_cnt, $test_results, $failed_tests_file, $result_tests_file, $PHP_FAILED_TESTS;
+	global $workers, $test_idx, $test_cnt, $test_results, $failed_tests_file, $result_tests_file, $PHP_FAILED_TESTS, $shuffle;
 
 	// The PHP binary running run-tests.php, and run-tests.php itself
 	// This PHP executable is *not* necessarily the same as the tested version
@@ -1378,6 +1382,11 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
 	// for tests with a common conflict key.
 	$test_files = array_reverse($test_files);
 
+	// To discover parallelization issues it is useful to randomize the test order.
+	if ($shuffle) {
+		shuffle($test_files);
+	}
+
 	echo "Spawning workers… ";
 
 	// We use sockets rather than STDIN/STDOUT for comms because on Windows,
@@ -1518,7 +1527,7 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
 						case "ready":
 							// Batch multiple tests to reduce communication overhead.
 							$files = [];
-							$batchSize = 32;
+							$batchSize = $shuffle ? 4 : 32;
 							while (count($files) <= $batchSize && $file = array_pop($test_files)) {
 								foreach ($fileConflictsWith[$file] as $conflictKey) {
 									if (isset($activeConflicts[$conflictKey])) {
@@ -1964,7 +1973,7 @@ function run_test($php, $file, $env)
 	$temp_clean = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'clean.php';
 	$test_clean = $test_dir . DIRECTORY_SEPARATOR . $main_file_name . 'clean.php';
 	$preload_filename = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'preload.php';
-	$tmp_post = $temp_dir . DIRECTORY_SEPARATOR . uniqid('/phpt.');
+	$tmp_post = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'post';
 	$tmp_relative_file = str_replace(__DIR__ . DIRECTORY_SEPARATOR, '', $test_file) . 't';
 
 	if ($temp_source && $temp_target) {