aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-04-24 07:31:29 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-04-24 07:31:29 +0200
commit439bf53496d6ed5fcef1d2e71793b46369f8205f (patch)
treed5930c06d2182d0e69b8901766e67442647ba2bd
parent1a4c27355e146b6d8cc6487b998462c7fdd1048f (diff)
downloadglibc-439bf53496d6ed5fcef1d2e71793b46369f8205f.tar
glibc-439bf53496d6ed5fcef1d2e71793b46369f8205f.tar.gz
glibc-439bf53496d6ed5fcef1d2e71793b46369f8205f.tar.bz2
glibc-439bf53496d6ed5fcef1d2e71793b46369f8205f.zip
locale/tst-locale-locpath: Run test only for $(run-built-tests) == yes
-rw-r--r--ChangeLog6
-rw-r--r--locale/Makefile5
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d7a1165cbd..37a39c023f 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 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