From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 24 Apr 2019 05:31:29 +0000 (+0200)
Subject: locale/tst-locale-locpath: Run test only for $(run-built-tests) == yes
X-Git-Tag: glibc-2.30~205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=439bf53496d6ed5fcef1d2e71793b46369f8205f;p=thirdparty%2Fglibc.git

locale/tst-locale-locpath: Run test only for $(run-built-tests) == yes
---

diff --git a/ChangeLog b/ChangeLog
index d7a1165cbd8..37a39c023f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-24  Florian Weimer  <fweimer@redhat.com>
+
+	* locale/Makefile (tests-special): Guard setting by
+	$(run-built-tests) == yes, otherwise tst-locale-locpath attempts
+	to run while cross-compiling.
+
 2019-04-23  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	[BZ #18035]
diff --git a/locale/Makefile b/locale/Makefile
index 6822b795dd0..0ad99ecabf9 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