[patches] Running tests while cross-compiling

[Jim Blandy <jimb@xxxxxxxxxxxxxxxx>]

Here's the patch I'm working with for running tests in a
cross-compiled EGLIBC.  With this, it seems that most of the tests run
properly; I'm working through the exceptions.  The script's help
message includes instructions for its use.

Comments welcome, as always.

ChangeLog.eglibc:
2007-01-23  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>

	* scripts/cross-test-ssh.sh: New script.
	* Rules (tests, xtests): Don't disable running tests when
	cross-compiling.
	* Makeconfig (built-program-cmd): Use cross-test-wrapper, if set.

Index: scripts/cross-test-ssh.sh
===================================================================
--- scripts/cross-test-ssh.sh	(revision 0)
+++ scripts/cross-test-ssh.sh	(revision 0)
@@ -0,0 +1,102 @@
+#!/bin/sh
+# usage: cross-test-ssh.sh HOST COMMAND ...
+# 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'
+
+usage="usage: ${progname} HOST COMMAND ..."
+help="Run an EGLIBC test COMMAND on the remote machine HOST, via ssh,
+passing environment variables, preserving the current working directory,
+and respecting quoting.
+
+To use this to run EGLIBC tests, invoke the tests as follows:
+
+  $ make cross-test-wrapper='ABSPATH/cross-test-ssh.sh HOST' tests
+
+where ABSPATH is the absolute path to this script, and HOST is the
+name of the machine to connect to via ssh.
+
+HOST and the build machines (on which 'make check' is being run) must
+share a filesystem; all files needed by the tests must be visible at
+the same paths on both machines.
+
+${progname} runs COMMAND in the same directory on the HOST that
+${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}"
+
+if [ "x$1" = "x--help" ]; then
+    echo "$usage"
+    echo "$help"
+    exit 0
+fi
+
+if [ $# -lt 2 ]; then
+    echo "$usage" >&2
+    echo "Type '${progname} --help' for more detailed help." >&2
+    exit 1
+fi
+
+host="$1"; shift
+
+# Return all input as a properly quoted Bourne shell string.
+bourne_quote () {
+    echo -n '"'
+    sed -n \
+        -e '1h' \
+        -e '2,$H' \
+        -e '${g
+              s/["$\`]/\\&/g
+              p
+             }'
+    echo -n '"'
+}
+
+# Echo all lines of input except those starting with 'export VAR=',
+# where VAR is a blacklisted variable.  Turn lines starting with
+# 'declare -x VAR=' into the analogous export commands, before
+# blacklisting.
+blacklist_exports () {
+    local pat
+    pat="$(for var in ${env_blacklist}; do
+             echo "^export ${var}="
+           done)"
+    sed -e 's|^declare -x |export |' \
+        | grep -v -e "$pat"
+}
+
+# Produce properly quoted Bourne shell arguments for 'env' to carry
+# over the current environment, less blacklisted variables.
+# The 'export -p' command munges the values of environment variables if
+# they contain newlines.
+exports="$(export -p | blacklist_exports)"
+
+# Transform the current argument list into a properly quoted Bourne shell
+# command string.
+command="$(for word in "$@"; do
+               echo -n "$word" | bourne_quote
+               echo -n ' '
+           done)"
+
+p () {
+    echo "$*"
+}
+
+# Add commands to set environment variables and the current directory.
+command="${exports}
+cd $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,
+# so we need to re-quote the whole command to ensure it appears as
+# the sole argument of the '-c' option.
+ssh "$host" /bin/sh -c "$(echo "${command}" | bourne_quote)"

Property changes on: scripts/cross-test-ssh.sh
___________________________________________________________________
Name: svn:executable
   + *

Index: Rules
===================================================================
--- Rules	(revision 160988)
+++ Rules	(working copy)
@@ -91,17 +91,17 @@
 else
 others: $(addprefix $(objpfx),$(extra-objs))
 endif
-ifeq ($(cross-compiling),yes)
-tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
-xtests: tests
-else
+# ifeq ($(cross-compiling),yes)
+# tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
+# xtests: tests
+# else
 ifeq ($(build-bounded),yes)
 tests-bp.out = $(tests:%=$(objpfx)%-bp.out)
 xtests-bp.out = $(xtests:%=$(objpfx)%-bp.out)
 endif
 tests: $(tests:%=$(objpfx)%.out) $(tests-bp.out)
 xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-bp.out)
-endif
+# endif
 
 ifeq ($(build-programs),yes)
 binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs)
Index: Makeconfig
===================================================================
--- Makeconfig	(revision 160988)
+++ Makeconfig	(working copy)
@@ -561,7 +561,8 @@
 run-program-prefix =
 endif
 # Never use $(run-program-prefix) for the statically-linked %-bp test programs
-built-program-cmd = $(patsubst %,$(run-program-prefix),\
+built-program-cmd = $(cross-test-wrapper) \
+		    $(patsubst %,$(run-program-prefix),\
 			$(filter-out %-bp,$(built-program-file))) \
 		    $(built-program-file)