@@ -334,9 +334,17 @@ END
sub target_adjust_timeout ($$) {
my ($ho,$timeoutref) = @_; # $ho might be a $gho
+ my $adjust = sub {
+ my ($factor, $what) = @_;
+ return unless defined $factor;
+ return if $factor==1;
+ logm("(adjusting timeout by factor $factor, from $what)");
+ $$timeoutref *= $factor;
+ };
if ($ho->{Guest}) {
my $context = $ho->{TimeoutContext} // 'general';
- $$timeoutref *= guest_var($ho,"${context}_timeoutfactor",1);
+ my $guest_var = "${context}_timeoutfactor";
+ $adjust->(guest_var($ho,$guest_var), "guest variable $guest_var");
}
}
If a timeout is adjusted, print a log message. We are going to want to reuse this logic in a moment. Do the defaulting in $adjust->() rather than passing 1 as a default to the lookup functions, which is slightly neater. Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- Osstest/TestSupport.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)