From patchwork Sat Jun 14 20:31:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Schwab X-Patchwork-Id: 1505 Received: (qmail 23013 invoked by alias); 14 Jun 2014 20:31:44 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 23000 invoked by uid 89); 14 Jun 2014 20:31:43 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.2 X-HELO: mail-out.m-online.net X-Auth-Info: IdeJKc4o0uqpjBXXkYSXCF2LE3bvQwj1j3qNq8dLGGI= From: Andreas Schwab To: "Joseph S. Myers" Cc: Subject: Re: Don't require test wrappers to preserve environment variables, use more consistent environment References: X-Yow: QUIET!! I'm being CREATIVE!! Is it GREAT yet? It's s'posed to SMOKEY THE BEAR... Date: Sat, 14 Jun 2014 22:31:36 +0200 In-Reply-To: (Joseph S. Myers's message of "Fri, 6 Jun 2014 20:41:15 +0000") Message-ID: <87r42r8c7r.fsf@igel.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.91 (gnu/linux) MIME-Version: 1.0 "Joseph S. Myers" 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