From: Will Newton <will.newton@linaro.org>
Date: Tue, 16 Sep 2014 19:32:55 +0000 (-0700)
Subject: Allow cross-building of tests
X-Git-Tag: glibc-2.21~532
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=85bb81c91b9cf7495aa4d7e567eae2861f54b997;p=thirdparty%2Fglibc.git

Allow cross-building of tests

Allow building tests in a cross configuration without a test wrapper
defined. This is helpful for doing simple build testing of tests.

ChangeLog:

2014-09-30  Will Newton  <will.newton@linaro.org>

	* localedata/Makefile: Move assignment to tests-special
	into an ifdef testing run-built-tests.
	* timezone/Makefile: Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 9acecce82c7..eaadc877caa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-30  Will Newton  <will.newton@linaro.org>
+
+	* localedata/Makefile: Move assignment to tests-special
+	into an ifdef testing run-built-tests.
+	* timezone/Makefile: Likewise.
+
 2014-09-29  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/x86/Makefile ($(objpfx)tst-ld-sse-use.out): Run script
diff --git a/localedata/Makefile b/localedata/Makefile
index b6235f26c7f..c2c62a21222 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -92,14 +92,14 @@ install-others := $(addprefix $(inst_i18ndir)/, \
 
 tests: $(objdir)/iconvdata/gconv-modules
 
+tests-static += tst-langinfo-static
+
+ifeq ($(run-built-tests),yes)
 tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \
 		 $(objpfx)tst-locale.out $(objpfx)tst-rpmatch.out \
 		 $(objpfx)tst-trans.out $(objpfx)tst-ctype.out \
 		 $(objpfx)tst-langinfo.out $(objpfx)tst-langinfo-static.out \
 		 $(objpfx)tst-numeric.out
-tests-static += tst-langinfo-static
-
-ifeq ($(run-built-tests),yes)
 # We have to generate locales
 LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   en_US.ISO-8859-1 en_US.UTF-8 ja_JP.EUC-JP da_DK.ISO-8859-1 \
diff --git a/timezone/Makefile b/timezone/Makefile
index 66b59ceedad..ad76e485cd5 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -45,11 +45,13 @@ generated += tzselect
 
 testdata = $(objpfx)testdata
 
+ifeq ($(run-built-tests),yes)
 # List zones generated by separate commands running zic on the host.
 # Each such zic run counts as a separate test.
 test-zones := America/New_York Etc/UTC UTC Europe/Berlin \
 	      Australia/Melbourne America/Sao_Paulo Asia/Tokyo
 tests-special += $(addprefix $(testdata)/, $(test-zones))
+endif
 
 include ../Rules