Don't require test wrappers to preserve environment variables

  One wart in the original support for test wrappers for cross testing,
as noted in
<https://sourceware.org/ml/libc-alpha/2012-10/msg00722.html>, is the
requirement for test wrappers to pass a poorly-defined set of
environment variables from the build system to the system running the
glibc under test.  Although some variables are passed explicitly via
$(test-wrapper-env), including LD_* variables that simply can't be
passed implicitly because of the side effects they'd have on the build
system's dynamic linker, others are passed implicitly, including
variables such as GCONV_PATH and LOCPATH that could potentially affect
the build system's libc (so effectively relying on any such effects
not breaking the wrappers).  In addition, the code in
cross-test-ssh.sh for preserving environment variables is fragile (it
depends on how bash formats a list of exported variables, and could
well break for multi-line variable definitions where the contents
contain things looking like other variable definitions).

This patch moves to explicitly passing environment variables via
$(test-wrapper-env).  Makefile variables that previously used
$(test-wrapper) are split up into -before-env and -after-env parts
that can be passed separately to the various .sh files used in
testing, so those files can then insert environment settings between
the two parts.  A further motivation for this is to make the comment
default environment settings in make-test-out (currently
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C) into a separate
makefile variable that can also be passed to scripts, rather than many
scripts duplicating those settings (for testing an installed glibc, it
would be desirable to have the GCONV_PATH setting on just one place,
so just that one place needs to support it pointing to an installed
sysroot instead of the build tree).  I think it will also make sense
to have a default LOCPATH setting in once place as well rather than
all the tests needing locales repeating that individually.

Where environment variable settings such as LC_ALL=C seemed plausibly
relevant on both systems for cross testing, I left the existing
settings in the scripts as well as having those variables passed
explicitly to $(test-wrapper-env), so they remain set on both systems.

One issue with this patch is that it's no longer so easy to pass
TIMEOUTFACTOR through for cross testing.  Do people think
cross-test-ssh.sh should special-case passing through that variable
(but a whitelist of variables to pass in place of the previous
blacklist of variables not to pass), or would it be better for it to
have a --timeoutfactor command-line option that causes it to set
TIMEOUTFACTOR on the remote system?

Tested x86_64 (native) and powerpc32 (cross).

2014-05-21  Joseph Myers  <joseph@codesourcery.com>

	* Makeconfig (run-program-prefix-before-env): New variable.
	(run-program-prefix-after-env): Likewise.
	(built-program-cmd-before-env): Likewise.
	(built-program-cmd-after-env): Likewise.
	(test-program-prefix-before-env): Likewise.
	(test-program-prefix-after-env): Likewise.
	(test-program-cmd-before-env): Likewise.
	(test-program-cmd-after-env): Likewise.
	* scripts/cross-test-ssh.sh (env_blacklist): Remove variable.
	(help): Do not mention environment variables.
	(blacklist_exports): Remove function.
	(exports): Remove variable.
	(command): Do not include ${exports}.
	* manual/install.texi (Configuring and compiling): Do not mention
	test wrappers preserving environment variables.
	* INSTALL: Regenerated.
	* catgets/Makefile ($(objpfx)test1.cat): Use
	$(built-program-cmd-before-env) and
	$(built-program-cmd-after-env).
	($(objpfx)test2.cat): Likewise.
	($(objpfx)de/libc.cat): Likewise.
	($(objpfx)test-gencat.out): Use $(test-program-cmd-before-env) and
	$(test-program-cmd-after-env).
	($(objpfx)sample.SJIS.cat): Use $(built-program-cmd-before-env)
	and $(built-program-cmd-after-env).
	* catgets/test-gencat.sh: Use test_program_cmd_before_env and
	test_program_cmd_after_env arguments.
	* iconvdata/Makefile ($(objpfx)iconv-test.out): Use
	$(test-wrapper-env).
	($(objpfx)tst-tables.out): Use $(test-program-prefix-before-env)
	and $(test-program-prefix-after-env).
	* iconvdata/run-iconv-test.sh: Use test_wrapper_env argument.
	* iconvdata/tst-table.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* iconvdata/tst-tables.sh: Likewise.
	* intl/Makefile ($(objpfx)tst-gettext.out): Use
	$(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	($(objpfx)tst-translit.out): Likewise.
	($(objpfx)tst-gettext2.out): Likewise.
	($(objpfx)tst-gettext4.out): Likewise.
	($(objpfx)tst-gettext6.out): Likewise.
	* intl/tst-gettext.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* intl/tst-gettext2.sh: Likewise.
	* intl/tst-gettext4.sh: Likewise.
	* intl/tst-gettext6.sh: Likewise.
	* intl/tst-translit.sh: Likewise.
	* localedata/Makefile ($(objpfx)sort-test.out): Use
	$(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	($(objpfx)tst-fmon.out): Use $(run-program-prefix-before-env),
	$(run-program-prefix-after-env), $(test-program-prefix-before-env)
	and $(test-program-prefix-after-env).
	($(objpfx)tst-numeric.out): Use $(test-program-prefix-before-env)
	and $(test-program-prefix-after-env).
	($(objpfx)tst-locale.out): Use $(built-program-cmd-before-env) and
	$(built-program-cmd-after-env).
	($(objpfx)tst-rpmatch.out): Use $(test-program-cmd-before-env) and
	$(test-program-cmd-after-env).
	($(objpfx)tst-trans.out): Use $(run-program-prefix-before-env),
	$(run-program-prefix-after-env), $(test-program-prefix-before-env)
	and $(test-program-prefix-after-env).
	($(objpfx)tst-mbswcs.out): Use $(test-program-prefix-before-env)
	and $(test-program-prefix-after-env).
	($(objpfx)tst-ctype.out): Use $(test-program-cmd-before-env) and
	$(test-program-cmd-after-env).
	($(objpfx)tst-wctype.out): Likewise.
	($(objpfx)tst-langinfo.out): Likewise.
	($(objpfx)tst-langinfo-static.out): Likewise.
	* localedata/sort-test.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* localedata/tst-ctype.sh: Use tst_ctype_before_env and
	tst_ctype_after_env arguments.
	* localedata/tst-fmon.sh: Use run_program_prefix_before_env,
	run_program_prefix_after_env, test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* localedata/tst-langinfo.sh: Use tst_langinfo_before_env and
	tst_langinfo_after_env arguments.
	* localedata/tst-locale.sh: Use localedef_before_env and
	localedef_after_env arguments.
	* localedata/tst-mbswcs.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* localedata/tst-numeric.sh: Likewise.
	* localedata/tst-rpmatch.sh: Use tst_rpmatch_before_env and
	tst_rpmatch_after_env arguments.
	* localedata/tst-trans.sh: Use run_program_prefix_before_env,
	run_program_prefix_after_env, test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* localedata/tst-wctype.sh: Use tst_wctype_before_env and
	tst_wctype_after_env arguments.
	* malloc/Makefile: Use $(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	* malloc/tst-mtrace.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* nptl/tst-tls6.sh: Set LC_ALL=C and LANG=C explicitly with each
	use of ${test_wrapper_env}.
	* posix/Makefile ($(objpfx)wordexp-tst.out): Use
	$(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	* posix/wordexp-tst.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.
	* stdio-common/Makefile ($(objpfx)tst-printf.out): Use
	$(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	* stdio-common/tst-printf.sh: Use test_program_prefix_before_env
	and test_program_prefix_after_env arguments.
	* stdlib/Makefile ($(objpfx)tst-fmtmsg.out): Use
	$(test-program-prefix-before-env) and
	$(test-program-prefix-after-env).
	* stdlib/tst-fmtmsg.sh: Use test_program_prefix_before_env and
	test_program_prefix_after_env arguments.  Split $test calls into
	$test_pre and $test.

Don't require test wrappers to preserve environment variables

Commit Message

Comments

Patch