From patchwork Mon May 20 17:40:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 32771 Received: (qmail 99402 invoked by alias); 20 May 2019 17:40:53 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 99393 invoked by uid 89); 20 May 2019 17:40:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-19.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.1 spammy=Outer X-HELO: mx1.redhat.com From: Florian Weimer To: libc-alpha@sourceware.org Cc: dj@redhat.com Subject: [PATCH] test-in-container: Do not set GCONV_PATH, LOCPATH Date: Mon, 20 May 2019 19:40:48 +0200 Message-ID: <871s0thvmn.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 These environment variables are incorrect inside the container. 2019-05-20 Florian Weimer test-in-container: Do not set GCONV_PATH, LOCPATH. * Makeconfig (run-program-env-container): New variable. (run-program-env): Use it. * Rules ($(tests-container:%=$(objpfx)%.out)): Update comment. Use $(run-program-env-container) instead of $(run-program-env). diff --git a/Makeconfig b/Makeconfig index 0e386fbc19..2fbd3c0192 100644 --- a/Makeconfig +++ b/Makeconfig @@ -743,10 +743,13 @@ run-via-rtld-prefix = \ else run-via-rtld-prefix = endif +# Test-in-containers need fewer environment variables. +run-program-env-container = LC_ALL=C # $(run-program-env) is the default environment variable settings to # use when running a program built with the newly built library. run-program-env = GCONV_PATH=$(common-objpfx)iconvdata \ - LOCPATH=$(common-objpfx)localedata LC_ALL=C + LOCPATH=$(common-objpfx)localedata \ + $(run-program-env-container) # $(run-program-prefix) is a command that, when prepended to the name # of a program built with the newly built library, produces a command # that, executed on the build system on which "make" is run, runs that diff --git a/Rules b/Rules index 222dba6dcb..2c8f1eecb0 100644 --- a/Rules +++ b/Rules @@ -273,10 +273,15 @@ $(objpfx)%.out: /dev/null $(objpfx)% # Make it 2nd arg for canned sequence. # Any tests that require an isolated container (filesystem, network # and pid namespaces) in which to run, should be added to # tests-container. +# +# Note: Outer use of $(run-program-env-container) instead of +# $(run-program-env) assumes that support/test-container does not use +# locales or gconv modules. $(tests-container:%=$(objpfx)%.out): $(objpfx)%.out : $(if $(wildcard $(objpfx)%.files),$(objpfx)%.files,/dev/null) $(objpfx)% - $(test-wrapper-env) $(run-program-env) $(run-via-rtld-prefix) \ - $(common-objpfx)support/test-container env $(run-program-env) $($*-ENV) \ - $(host-test-program-cmd) $($*-ARGS) > $@; \ + $(test-wrapper-env) $(run-program-env-container) \ + $(run-via-rtld-prefix) \ + $(common-objpfx)support/test-container env $($*-ENV) \ + $(host-test-program-cmd) $($*-ARGS) > $@; \ $(evaluate-test)