This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: Support cross-testing (version 3)
- From: Andreas Schwab <schwab at linux-m68k dot org>
- To: "Joseph S. Myers" <joseph at codesourcery dot com>
- Cc: Roland McGrath <roland at hack dot frob dot com>, <libc-alpha at sourceware dot org>
- Date: Fri, 02 Nov 2012 22:42:10 +0100
- Subject: Re: Support cross-testing (version 3)
- References: <Pine.LNX.4.64.1210242035130.14661@digraph.polyomino.org.uk><20121024213718.0A4FC2C09B@topped-with-meat.com><Pine.LNX.4.64.1210242300040.14661@digraph.polyomino.org.uk><m2a9uz9ac1.fsf@igel.home><Pine.LNX.4.64.1211021739440.16267@digraph.polyomino.org.uk>
* scripts/cross-test-ssh.sh (command): Use newlines to separate
commands. Quote $PWD.
(blacklist_exports): Don't use remove_newlines. Replace "declare
-x" by "export".
(remove_newlines): Remove.
---
scripts/cross-test-ssh.sh | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index f09c98e..62cd6a0 100755
--- a/scripts/cross-test-ssh.sh
+++ b/scripts/cross-test-ssh.sh
@@ -108,37 +108,25 @@ bourne_quote ()
done
}
-# Remove unnecessary newlines from a Bourne shell command sequence.
-remove_newlines ()
-{
- sed -n \
- -e '1h' \
- -e '2,$H' \
- -e '${g
- s/\([^\]\)\n/\1; /g
- p
- }'
-}
-
# Unset all variables from the blacklist. Then echo all exported
-# variables. The 'export -p' command adds backslashes for environment
-# variables which contain newlines.
+# variables.
blacklist_exports ()
{
- (unset ${env_blacklist}; export -p) | remove_newlines
+ (unset ${env_blacklist}; export -p) | sed 's/^declare -x/export/'
}
# Produce properly quoted Bourne shell arguments for 'env' to carry
# over the current environment, less blacklisted variables.
exports="$(blacklist_exports)"
-exports="${exports:+${exports}; }"
# Transform the current argument list into a properly quoted Bourne shell
# command string.
command="$(bourne_quote "$@")"
# Add commands to set environment variables and the current directory.
-command="${exports}cd $PWD; ${command}"
+command="${exports}
+cd $(bourne_quote "$PWD")
+${command}"
# HOST's sshd simply concatenates its arguments with spaces and
# passes them to some shell. We want to force the use of /bin/sh,
--
1.8.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."