Allow cross-building of tests
diff mbox

Message ID 1410903170-31206-1-git-send-email-will.newton@linaro.org
State New
Headers show

Commit Message

Will Newton Sept. 16, 2014, 9:32 p.m. UTC
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-16  Will Newton  <will.newton@linaro.org>

	* localedata/Makefile: Move assignment to tests-special
	into an ifdef testing run-built-tests.
	* timezone/Makefile: Likewise.
---
 localedata/Makefile | 6 +++---
 timezone/Makefile   | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Will Newton Sept. 24, 2014, 2:38 p.m. UTC | #1
On 16 September 2014 14:32, Will Newton <will.newton@linaro.org> wrote:
> 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-16  Will Newton  <will.newton@linaro.org>
>
>         * localedata/Makefile: Move assignment to tests-special
>         into an ifdef testing run-built-tests.
>         * timezone/Makefile: Likewise.
> ---
>  localedata/Makefile | 6 +++---
>  timezone/Makefile   | 2 ++
>  2 files changed, 5 insertions(+), 3 deletions(-)

Ping?

> diff --git a/localedata/Makefile b/localedata/Makefile
> index b6235f2..c2c62a2 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 66b59ce..ad76e48 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
>
> --
> 1.9.3
>
Siddhesh Poyarekar Sept. 24, 2014, 3:02 p.m. UTC | #2
On Tue, Sep 16, 2014 at 02:32:49PM -0700, Will Newton wrote:
> 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-16  Will Newton  <will.newton@linaro.org>
> 
> 	* localedata/Makefile: Move assignment to tests-special
> 	into an ifdef testing run-built-tests.
> 	* timezone/Makefile: Likewise.

Looks OK to me assuming that you've tested it.

Siddhesh

> ---
>  localedata/Makefile | 6 +++---
>  timezone/Makefile   | 2 ++
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/localedata/Makefile b/localedata/Makefile
> index b6235f2..c2c62a2 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 66b59ce..ad76e48 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
>  
> -- 
> 1.9.3
>

Patch
diff mbox

diff --git a/localedata/Makefile b/localedata/Makefile
index b6235f2..c2c62a2 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 66b59ce..ad76e48 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