Document test-wrapper-env-only in INSTALL.

3 files changed, 25 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3925263..67780ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-06  Roland McGrath  <roland@hack.frob.com>
+
+	* manual/install.texi (Configuring and compiling):
+	Document test-wrapper-env-only.
+	* INSTALL: Regenerated.
+
 2015-03-06  Paul Pluzhnikov  <ppluzhnikov@google.com>
 
 	[BZ #18043]
diff --git a/INSTALL b/INSTALL
index 5e538a6..18a47f6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -254,7 +254,12 @@ program that runs a newly built program with environment variable
 assignments in effect, those assignments being specified as 'VAR=VALUE'
 before the name of the program to be run.  If multiple assignments to
 the same variable are specified, the last assignment specified must take
-precedence.
+precedence.  Similarly, if 'TEST-WRAPPER env -i' will not work to run a
+program with an environment completely empty of variables except those
+directly assigned, then 'test-wrapper-env-only' must be set; its use has
+the same syntax as 'test-wrapper-env', the only difference in its
+semantics being starting with an empty set of environment variables
+rather than the ambient set.
 
 Installing the C Library
 ========================
diff --git a/manual/install.texi b/manual/install.texi
index a3acfda..bb09199 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -283,14 +283,19 @@ In general, when testing @theglibc{}, @samp{test-wrapper} may be set
 to the name and arguments of any program to run newly built binaries.
 This program must preserve the arguments to the binary being run, its
 working directory and the standard input, output and error file
-descriptors.  If
-@samp{@var{test-wrapper} env} will not work to run a program with
-environment variables set, then @samp{test-wrapper-env} must be set to
-a program that runs a newly built program with environment variable
-assignments in effect, those assignments being specified as
-@samp{@var{var}=@var{value}} before the name of the program to be
-run.  If multiple assignments to the same variable are specified,
-the last assignment specified must take precedence.
+descriptors.  If @samp{@var{test-wrapper} env} will not work to run a
+program with environment variables set, then @samp{test-wrapper-env}
+must be set to a program that runs a newly built program with
+environment variable assignments in effect, those assignments being
+specified as @samp{@var{var}=@var{value}} before the name of the
+program to be run.  If multiple assignments to the same variable are
+specified, the last assignment specified must take precedence.
+Similarly, if @samp{@var{test-wrapper} env -i} will not work to run a
+program with an environment completely empty of variables except those
+directly assigned, then @samp{test-wrapper-env-only} must be set; its
+use has the same syntax as @samp{test-wrapper-env}, the only
+difference in its semantics being starting with an empty set of
+environment variables rather than the ambient set.
 
 
 @node Running make install