* Fix locale/tst-locale-locpath cross-testing when sshd sets LANG
@ 2020-01-23 22:26 Joseph Myers
2020-01-24 0:08 ` Carlos O'Donell
0 siblings, 1 reply; 3+ messages in thread
From: Joseph Myers @ 2020-01-23 22:26 UTC (permalink / raw)
To: libc-alpha; +Cc: siddhesh
The locale/tst-locale-locpath test unsets LANG, then runs a test with
test_wrapper_env and expects LANG to remain unset for that test. This
does not work for cross-testing with cross-test-ssh.sh when sshd (on
the system specified as an argument to cross-test-ssh.sh) is
configured to have a default LANG setting.
The general design used in cross testing, after commit
8540f6d2a74fe9d67440535ebbcfa252180a3172 ("Don't require test wrappers
to preserve environment variables, use more consistent environment.",
6 June 2014), is that environment settings required by tests should be
passed explicitly to $(test-wrapper-env). This patch changes
tst-locale-locpath.sh to pass an explicit LANG= rather than expecting
"unset LANG" to be in effect for the program run under
test_wrapper_env. Note that this does slightly change the environment
in which the test is run natively (empty LANG instead of unset LANG)
but that difference does not appear relevant to what it is trying to
test.
Tested for Arm that this fixes the failure seen for that test in
cross-testing.
diff --git a/locale/tst-locale-locpath.sh b/locale/tst-locale-locpath.sh
index bafdf91e20..f37d452723 100644
--- a/locale/tst-locale-locpath.sh
+++ b/locale/tst-locale-locpath.sh
@@ -34,10 +34,8 @@ trap cleanup 0
rm -rf "$testroot"
mkdir -p $testroot
-unset LANG
-
${test_wrapper_env} \
-${run_program_env} LC_ALL=invalid-locale LOCPATH=does-not-exist \
+${run_program_env} LANG= LC_ALL=invalid-locale LOCPATH=does-not-exist \
${common_objpfx}elf/ld.so --library-path "$LIBPATH" \
"${common_objpfx}locale/locale" \
> "$testroot/stdout" 2> "$testroot/stderr"
--
Joseph S. Myers
joseph@codesourcery.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Fix locale/tst-locale-locpath cross-testing when sshd sets LANG
2020-01-23 22:26 Fix locale/tst-locale-locpath cross-testing when sshd sets LANG Joseph Myers
@ 2020-01-24 0:08 ` Carlos O'Donell
2020-01-24 2:59 ` Siddhesh Poyarekar
0 siblings, 1 reply; 3+ messages in thread
From: Carlos O'Donell @ 2020-01-24 0:08 UTC (permalink / raw)
To: Joseph Myers, libc-alpha; +Cc: siddhesh
On 1/23/20 4:45 PM, Joseph Myers wrote:
> The locale/tst-locale-locpath test unsets LANG, then runs a test with
> test_wrapper_env and expects LANG to remain unset for that test. This
> does not work for cross-testing with cross-test-ssh.sh when sshd (on
> the system specified as an argument to cross-test-ssh.sh) is
> configured to have a default LANG setting.
Agreed.
> The general design used in cross testing, after commit
> 8540f6d2a74fe9d67440535ebbcfa252180a3172 ("Don't require test wrappers
> to preserve environment variables, use more consistent environment.",
> 6 June 2014), is that environment settings required by tests should be
> passed explicitly to $(test-wrapper-env). This patch changes
> tst-locale-locpath.sh to pass an explicit LANG= rather than expecting
> "unset LANG" to be in effect for the program run under
> test_wrapper_env. Note that this does slightly change the environment
> in which the test is run natively (empty LANG instead of unset LANG)
> but that difference does not appear relevant to what it is trying to
> test.
Agreed, that way LANG is set in the ssh shell.
> Tested for Arm that this fixes the failure seen for that test in
> cross-testing.
OK for master if Siddhesh agrees.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
> diff --git a/locale/tst-locale-locpath.sh b/locale/tst-locale-locpath.sh
> index bafdf91e20..f37d452723 100644
> --- a/locale/tst-locale-locpath.sh
> +++ b/locale/tst-locale-locpath.sh
> @@ -34,10 +34,8 @@ trap cleanup 0
> rm -rf "$testroot"
> mkdir -p $testroot
>
> -unset LANG
> -
OK.
> ${test_wrapper_env} \
> -${run_program_env} LC_ALL=invalid-locale LOCPATH=does-not-exist \
> +${run_program_env} LANG= LC_ALL=invalid-locale LOCPATH=does-not-exist \
OK. LANG is set to empty consistently in the invocation under test_wrapper_env.
> ${common_objpfx}elf/ld.so --library-path "$LIBPATH" \
> "${common_objpfx}locale/locale" \
> > "$testroot/stdout" 2> "$testroot/stderr"
>
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Fix locale/tst-locale-locpath cross-testing when sshd sets LANG
2020-01-24 0:08 ` Carlos O'Donell
@ 2020-01-24 2:59 ` Siddhesh Poyarekar
0 siblings, 0 replies; 3+ messages in thread
From: Siddhesh Poyarekar @ 2020-01-24 2:59 UTC (permalink / raw)
To: Carlos O'Donell, Joseph Myers, libc-alpha
OK for master.
Thanks,
Siddhesh
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-24 2:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 22:26 Fix locale/tst-locale-locpath cross-testing when sshd sets LANG Joseph Myers
2020-01-24 0:08 ` Carlos O'Donell
2020-01-24 2:59 ` Siddhesh Poyarekar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).