about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2014-06-14 22:29:43 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2014-06-16 21:47:25 +0200
commitf2f6d82fe11d98021260f45a4d2837d7c927dd60 (patch)
tree03711d9100e579d3d1e68a1072b0cb37e8a992af
parenta7291117328b413295ae7d1c841e944bc60062d3 (diff)
downloadglibc-f2f6d82fe11d98021260f45a4d2837d7c927dd60.tar.gz
glibc-f2f6d82fe11d98021260f45a4d2837d7c927dd60.tar.xz
glibc-f2f6d82fe11d98021260f45a4d2837d7c927dd60.zip
Pass $TIMEOUTFACTOR to tests also in cross testing
-rw-r--r--ChangeLog5
-rwxr-xr-xscripts/cross-test-ssh.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b2d035e717..2eba950a42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-16  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* scripts/cross-test-ssh.sh (timeoutfactor): Default to
+	$TIMEOUTFACTOR.
+
 2014-06-16  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #17058]
diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index f2a80a0341..df367b82e4 100755
--- a/scripts/cross-test-ssh.sh
+++ b/scripts/cross-test-ssh.sh
@@ -61,7 +61,7 @@ that the shell on the build machine has already done them
 appropriately."
 
 ssh='ssh'
-timeoutfactor=
+timeoutfactor=$TIMEOUTFACTOR
 while [ $# -gt 0 ]; do
   case "$1" in