From patchwork Wed Apr 24 06:16:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 32398 Received: (qmail 83796 invoked by alias); 24 Apr 2019 06:16:36 -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 83665 invoked by uid 89); 24 Apr 2019 06:16:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_FILL_THIS_FORM_SHORT autolearn=ham version=3.3.1 spammy=6210 X-HELO: mx1.redhat.com From: Florian Weimer To: Joseph Myers Cc: Subject: Re: [PATCH] locale: Add LOCPATH diagnostics to the locale program References: <87sgu8eozk.fsf@oldenburg2.str.redhat.com> Date: Wed, 24 Apr 2019 08:16:30 +0200 In-Reply-To: (Joseph Myers's message of "Tue, 23 Apr 2019 21:57:24 +0000") Message-ID: <87y340q669.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 * Joseph Myers: > On Tue, 23 Apr 2019, Florian Weimer wrote: > >> diff --git a/locale/Makefile b/locale/Makefile >> index 764e751c36..6822b795dd 100644 >> --- a/locale/Makefile >> +++ b/locale/Makefile >> @@ -28,6 +28,7 @@ routines = setlocale findlocale loadlocale loadarchive \ >> localeconv nl_langinfo nl_langinfo_l mb_cur_max \ >> newlocale duplocale freelocale uselocale >> tests = tst-C-locale tst-locname tst-duplocale >> +tests-special = $(objpfx)tst-locale-locpath.out >> categories = ctype messages monetary numeric time paper name \ >> address telephone measurement identification collate >> aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ >> @@ -107,3 +108,7 @@ cpp-srcs-left := $(localedef-modules) $(localedef-aux) $(locale-modules) \ >> $(lib-modules) >> lib := locale-programs >> include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) >> + >> +$(objpfx)tst-locale-locpath.out : tst-locale-locpath.sh $(objpfx)locale >> + $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ >> + $(evaluate-test) > > This is missing run-built-tests conditionals so wrongly tries to run the > test unconditionally for cross-compilation. Oh. I will try to remember this aspect of tests-special. I fixed it with the patch below. Committed. Thanks, Florian locale/tst-locale-locpath: Run test only for $(run-built-tests) == yes 2019-04-24 Florian Weimer * locale/Makefile (tests-special): Guard setting by $(run-built-tests) == yes, otherwise tst-locale-locpath attempts to run while cross-compiling. diff --git a/locale/Makefile b/locale/Makefile index 6822b795dd..0ad99ecabf 100644 --- a/locale/Makefile +++ b/locale/Makefile @@ -28,7 +28,6 @@ routines = setlocale findlocale loadlocale loadarchive \ localeconv nl_langinfo nl_langinfo_l mb_cur_max \ newlocale duplocale freelocale uselocale tests = tst-C-locale tst-locname tst-duplocale -tests-special = $(objpfx)tst-locale-locpath.out categories = ctype messages monetary numeric time paper name \ address telephone measurement identification collate aux = $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \ @@ -63,6 +62,10 @@ lib-modules := charmap-dir simple-hash xmalloc xstrdup \ GPERF = gperf GPERFFLAGS = -acCgopt -k1,2,5,9,$$ -L ANSI-C +ifeq ($(run-built-tests),yes) +tests-special += $(objpfx)tst-locale-locpath.out +endif + include ../Rules CFLAGS-md5.c += -I../crypt