[OSSTEST PATCH 1/2] Revert "timeouts: Call target_adjust_timeout for all build commands"

[OSSTEST PATCH 1/2] Revert "timeouts: Call target_adjust_timeout for all build commands"

[Ian Jackson]

We actually do this already in tcmd, so this extra call adjusts it
twice.

This reverts commit 21d141d98ecb07d30b839829da9837af80f80728.
---
 Osstest/TestSupport.pm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 3123b40..3308193 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -629,8 +629,6 @@ END
         export http_proxy
 END
 
-    target_adjust_timeout($ho, \$timeout);
-
     target_cmd($ho, <<END.$distcc.$httpproxy.<<END.$script, $timeout);
 	set -xe
         LC_ALL=C; export LC_ALL
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[OSSTEST PATCH 2/2] timeouts: Print slightly better message

[Ian Jackson]

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/TestSupport.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 3308193..6ca8076 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -339,8 +339,9 @@ sub target_adjust_timeout ($$) {
 	my ($factor, $what) = @_;
 	return unless defined $factor;
 	return if $factor==1;
-	logm("(adjusting timeout by factor $factor, from $what)");
 	$$timeoutref *= $factor;
+	logm("(adjusting timeout by factor $factor to $$timeoutref,".
+             " due to $what)");
     };
     if ($ho->{Guest}) {
 	my $context = $ho->{TimeoutContext} // 'general';
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel