Re: Don't require test wrappers to preserve environment variables, use more consistent environment

[Andreas Schwab <schwab at linux-m68k dot org>]

"Joseph S. Myers" <joseph@codesourcery.com> writes:

> diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
> index 405ae99..f2a80a0 100755
> --- a/scripts/cross-test-ssh.sh
> +++ b/scripts/cross-test-ssh.sh
> @@ -21,17 +21,17 @@
>  # Run with --help flag to get more detailed help.
>  
>  progname="$(basename $0)"
> -env_blacklist='HOME LOGNAME MAIL PATH SHELL SHLVL SSH_CLIENT SSH_CONNECTION
> -USER TERM TERMCAP PWD'
>  
>  usage="usage: ${progname} [--ssh SSH] HOST COMMAND ..."
>  help="Run a glibc test COMMAND on the remote machine HOST, via ssh,
> -passing environment variables, preserving the current working directory,
> -and respecting quoting.
> +preserving the current working directory, and respecting quoting.
>  
>  If the '--ssh SSH' flag is present, use SSH as the SSH command,
>  instead of ordinary 'ssh'.
>  
> +If the '--timeoutfactor FACTOR' flag is present, set TIMEOUTFACTOR on
> +the remote machine to the specified FACTOR.
> +
>  To use this to run glibc tests, invoke the tests as follows:
>  
>    $ make test-wrapper='ABSPATH/cross-test-ssh.sh HOST' tests
> @@ -58,13 +58,10 @@ ${progname} itself is run in on the build machine.
>  The command and arguments are passed to the remote host in a way that
>  avoids any further shell substitution or expansion, on the assumption
>  that the shell on the build machine has already done them
> -appropriately.
> -
> -${progname} propagates the values all environment variables through to
> -the remote target, except the following:
> -${env_blacklist}"
> +appropriately."
>  
>  ssh='ssh'
> +timeoutfactor=
>  while [ $# -gt 0 ]; do
>    case "$1" in
>  
> @@ -76,6 +73,14 @@ while [ $# -gt 0 ]; do
>        ssh="$1"
>        ;;
>  
> +    "--timeoutfactor")
> +      shift
> +      if [ $# -lt 1 ]; then
> +        break
> +      fi
> +      timeoutfactor="$1"
> +      ;;
> +

This breaks backward compatibility.

Andreas.

	* scripts/cross-test-ssh.sh (timeoutfactor): Default to
	$TIMEOUTFACTOR.

diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index f2a80a0..df367b8 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
 
-- 
2.0.0


-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."