From 1852ae1cc8156de3f9dae5ba37615401196ab0af Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Wed, 16 Oct 2019 23:17:31 -0400 Subject: [PATCH] Tests: Tweak driver to still print status every 15 seconds. --- test_regress/driver.pl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 3c76f5a72..01fd41b40 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -360,13 +360,13 @@ sub wait_and_report { my $self = shift; $self->print_summary(force=>1); # Wait for all children to finish - while ($::Have_Forker && $::Fork->is_any_left()) { - $::Fork->poll(); - if (time() - ($self->{_last_summary_time} || 0) > 30) { + while ($::Fork->is_any_left) { + $::Fork->poll; + if (time() - ($self->{_last_summary_time} || 0) >= 30) { $self->print_summary(force=>1, show_running=>1); } Time::HiRes::usleep 100*1000; - }; + } $runner->report(undef); $runner->report($self->{driver_log_filename}); } @@ -403,7 +403,7 @@ sub print_summary { @_); if (!$self->{quiet} || $params{force} || ($self->{left_cnt} < 5) - || time() - ($self->{_last_summary_time} || 0) > 60 * 5) { + || time() - ($self->{_last_summary_time} || 0) >= 15) { $self->{_last_summary_time} = time(); print STDERR ("==SUMMARY: ".$self->sprint_summary."\n"); if ($params{show_running}) { @@ -2121,6 +2121,7 @@ sub kill_tree_all {} sub wait_all {} sub ready {} sub running {} +sub is_any_left { return 0; } ####################################################################### 1;