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 9acecce82c70a126997f929799aeb4cc557655f4..eaadc877caae332fcc76550ff2eb14295c151d21 100644 (file)
--- 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 b6235f26c7f9e9697ab8b247af200a6bc672ff09..c2c62a212229dbbed744955cb19c46af091bfe34 100644 (file)
--- 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 66b59ceedadcc5f83d4b7f6b7d7fcacfa708ab55..ad76e485cd5acc49bee6060c638b945334077bb3 100644 (file)
--- 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