diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 03:31:41 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-03-07 03:31:41 +0000 |
| commit | 6f99f280b00a30b8f0a89a4be1adb2bea41e2954 (patch) | |
| tree | cac5f1b73b1b255e39bdbf617e499c637c1691f6 /localedata | |
| parent | 0b20a9e89f5c74119d6da2a5af6c965ac4b18a50 (diff) | |
| download | glibc-6f99f280b00a30b8f0a89a4be1adb2bea41e2954.zip glibc-6f99f280b00a30b8f0a89a4be1adb2bea41e2954.tar.gz glibc-6f99f280b00a30b8f0a89a4be1adb2bea41e2954.tar.bz2 | |
Count miscellaneous files built on host for testing as tests.
In <https://sourceware.org/ml/libc-alpha/2014-01/msg00198.html> I
raised the question of counting miscellaneous dependencies of tests,
built on the host rather than the build system, as tests, so that when
test failures don't stop "make check" neither do those other builds on
the host, so that a flaky host doesn't stop "make check" from
producing a complete summary of test results. Brooks supported that
idea in <https://sourceware.org/ml/libc-alpha/2014-02/msg00301.html>.
This patch implements that change for all the examples I could find:
one message catalog in catgets/, locales in localedata/ and timezone
files in timezone/.
Tested x86_64.
* catgets/Makefile (tests-special): Add $(objpfx)sample.SJIS.cat.
($(objpfx)sample.SJIS.cat): Use $(evaluate-test).
* timezone/Makefile (testdata): Move definition above include of
Rules.
(test-zones): New variable.
(tests-special): Add zone files.
(build-testdata): Use $(evaluate-test).
localedata/ChangeLog:
* Makefile (LOCALES): Move definition above include of Rules.
(LOCALE_SRCS): Likewise.
(CHARMAPS): Likewise.
(CTYPE_FILES): Likewise.
(tests-special): Add locale files.
($(addprefix $(objpfx),$(CTYPE_FILES))): Use $(evaluate-test).
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | localedata/Makefile | 30 |
2 files changed, 24 insertions, 13 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 4e34fc5..7db10fb 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,12 @@ 2014-03-07 Joseph Myers <joseph@codesourcery.com> + * Makefile (LOCALES): Move definition above include of Rules. + (LOCALE_SRCS): Likewise. + (CHARMAPS): Likewise. + (CTYPE_FILES): Likewise. + (tests-special): Add locale files. + ($(addprefix $(objpfx),$(CTYPE_FILES))): Use $(evaluate-test). + * Makefile (generated): Rename tests to end with .out. (tests-special): Likewise. ($(objpfx)mtrace-tst-leaks): Likewise. diff --git a/localedata/Makefile b/localedata/Makefile index e9c0894..94562be 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -97,6 +97,21 @@ tests-special += $(objpfx)sort-test.out $(objpfx)tst-fmon.out \ $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \ $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out +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 \ + hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ + nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \ + zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \ + tr_TR.ISO-8859-9 +LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') +CHARMAPS := $(shell echo "$(LOCALES)" | \ + sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) +CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) +tests-special += $(addprefix $(objpfx),$(CTYPE_FILES)) +endif + include ../Rules # Install the charmap files in gzipped format. @@ -119,18 +134,6 @@ CFLAGS-tst-trans.c = -Wno-format 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 \ - hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \ - nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 tr_TR.UTF-8 cs_CZ.UTF-8 \ - zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 si_LK.UTF-8 \ - tr_TR.ISO-8859-9 -LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g') -CHARMAPS := $(shell echo "$(LOCALES)" | \ - sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g) -CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES)) - generated-dirs += $(LOCALES) # Dependency for the locale files. We actually make it depend only on @@ -138,7 +141,8 @@ generated-dirs += $(LOCALES) $(addprefix $(objpfx),$(CTYPE_FILES)): %: \ gen-locale.sh $(common-objpfx)locale/localedef Makefile \ $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS)) - @$(SHELL) gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@ + @$(SHELL) gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@; \ + $(evaluate-test) $(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \ $(addprefix $(objpfx),$(CTYPE_FILES)) |