From 786ad83b141c1e7c08ef1208539281cac8a5cf18 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Sun, 19 Nov 2023 22:29:33 +0100 Subject: [PATCH 1/4] added milisceonds to the test time output --- run-tests.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/run-tests.php b/run-tests.php index f545ec0e254ea..aa91dac3e8ce9 100755 --- a/run-tests.php +++ b/run-tests.php @@ -682,13 +682,13 @@ function main(): void if ($test_cnt) { putenv('NO_INTERACTION=1'); usort($test_files, "test_sort"); - $start_time = time(); + $start_time = microtime(true); echo "Running selected tests.\n"; $test_idx = 0; run_all_tests($test_files, $environment); - $end_time = time(); + $end_time = microtime(true); if ($failed_tests_file) { fclose($failed_tests_file); @@ -730,13 +730,13 @@ function main(): void $test_files = array_unique($test_files); usort($test_files, "test_sort"); - $start_time = time(); + $start_time = microtime(true); show_start($start_time); $test_cnt = count($test_files); $test_idx = 0; run_all_tests($test_files, $environment); - $end_time = time(); + $end_time = microtime(true); if ($failed_tests_file) { fclose($failed_tests_file); @@ -3064,7 +3064,7 @@ function get_summary(bool $show_ext_summary): string $summary .= ' Tests passed : ' . sprintf('%5d (%5.1f%%)', $sum_results['PASSED'], $percent_results['PASSED']) . ' ' . sprintf('(%5.1f%%)', $x_passed) . ' --------------------------------------------------------------------- -Time taken : ' . sprintf('%5d seconds', $end_time - $start_time) . ' +Time taken : ' . sprintf('%5.3f seconds', $end_time - $start_time) . ' ===================================================================== '; $failed_test_summary = ''; From bb145622c735588d10fe31cc815e6f14fbeb09e3 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Mon, 20 Nov 2023 22:35:05 +0100 Subject: [PATCH 2/4] Replaced microtime() with hrtime() --- run-tests.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/run-tests.php b/run-tests.php index aa91dac3e8ce9..f48e3e2621155 100755 --- a/run-tests.php +++ b/run-tests.php @@ -682,13 +682,13 @@ function main(): void if ($test_cnt) { putenv('NO_INTERACTION=1'); usort($test_files, "test_sort"); - $start_time = microtime(true); + $start_time = hrtime(true); echo "Running selected tests.\n"; $test_idx = 0; run_all_tests($test_files, $environment); - $end_time = microtime(true); + $end_time = hrtime(true); if ($failed_tests_file) { fclose($failed_tests_file); @@ -730,13 +730,13 @@ function main(): void $test_files = array_unique($test_files); usort($test_files, "test_sort"); - $start_time = microtime(true); + $start_time = hrtime(true); show_start($start_time); $test_cnt = count($test_files); $test_idx = 0; run_all_tests($test_files, $environment); - $end_time = microtime(true); + $end_time = hrtime(true); if ($failed_tests_file) { fclose($failed_tests_file); @@ -3064,7 +3064,7 @@ function get_summary(bool $show_ext_summary): string $summary .= ' Tests passed : ' . sprintf('%5d (%5.1f%%)', $sum_results['PASSED'], $percent_results['PASSED']) . ' ' . sprintf('(%5.1f%%)', $x_passed) . ' --------------------------------------------------------------------- -Time taken : ' . sprintf('%5.3f seconds', $end_time - $start_time) . ' +Time taken : ' . sprintf('%5.3f seconds', ($end_time - $start_time) / 1e9) . ' ===================================================================== '; $failed_test_summary = ''; @@ -3169,12 +3169,12 @@ function get_summary(bool $show_ext_summary): string function show_start(int $start_time): void { - echo "TIME START " . date('Y-m-d H:i:s', $start_time) . "\n=====================================================================\n"; + echo "TIME START " . date('Y-m-d H:i:s', $start_time / 1e9) . "\n=====================================================================\n"; } function show_end(int $end_time): void { - echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $end_time) . "\n"; + echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $end_time / 1e9) . "\n"; } function show_summary(): void From 99177602b38e7ac1275ac12b1f053fb03061ffca Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Sat, 23 Dec 2023 00:28:39 +0100 Subject: [PATCH 3/4] Fix timestamp for displaying start and end time --- run-tests.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/run-tests.php b/run-tests.php index f48e3e2621155..226223baacfa4 100755 --- a/run-tests.php +++ b/run-tests.php @@ -682,6 +682,7 @@ function main(): void if ($test_cnt) { putenv('NO_INTERACTION=1'); usort($test_files, "test_sort"); + $start_timestamp = time(); $start_time = hrtime(true); echo "Running selected tests.\n"; @@ -730,6 +731,7 @@ function main(): void $test_files = array_unique($test_files); usort($test_files, "test_sort"); + $start_timestamp = time(); $start_time = hrtime(true); show_start($start_time); @@ -755,7 +757,7 @@ function main(): void compute_summary(); - show_end($end_time); + show_end($start_timestamp, $start_time, $end_time); show_summary(); save_results($output_file, /* prompt_to_save_results: */ true); @@ -3167,14 +3169,14 @@ function get_summary(bool $show_ext_summary): string return $summary; } -function show_start(int $start_time): void +function show_start(int $start_timestamp): void { - echo "TIME START " . date('Y-m-d H:i:s', $start_time / 1e9) . "\n=====================================================================\n"; + echo "TIME START " . date('Y-m-d H:i:s', $start_timestamp) . "\n=====================================================================\n"; } -function show_end(int $end_time): void +function show_end(int $start_timestamp, float $start_time, float $end_time): void { - echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $end_time / 1e9) . "\n"; + echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $start_timestamp + (int)(($end_time - $start_time)/1e9)) . "\n"; } function show_summary(): void From ae56a492eb0445a770959aa893f7d41d3191edae Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Sat, 23 Dec 2023 16:12:54 +0100 Subject: [PATCH 4/4] Added int type for parameters for 32bit systems. --- run-tests.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-tests.php b/run-tests.php index 226223baacfa4..0e341ca762d65 100755 --- a/run-tests.php +++ b/run-tests.php @@ -3174,7 +3174,7 @@ function show_start(int $start_timestamp): void echo "TIME START " . date('Y-m-d H:i:s', $start_timestamp) . "\n=====================================================================\n"; } -function show_end(int $start_timestamp, float $start_time, float $end_time): void +function show_end(int $start_timestamp, int|float $start_time, int|float $end_time): void { echo "=====================================================================\nTIME END " . date('Y-m-d H:i:s', $start_timestamp + (int)(($end_time - $start_time)/1e9)) . "\n"; }