diff options
author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-03-16 13:36:39 +0000 |
---|---|---|
committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2009-03-16 13:36:39 +0000 |
commit | e72856950a9baa76ed41fb8d684cb13375daf48e (patch) | |
tree | 7ab013c14a29d8ad4d02b5c6aebe587f4806510e /test/locale | |
parent | 72e880a46d65bcce7374c59826531240d6a316ba (diff) |
Fixed makefiles inclusion flow to pass actual configuration variable values.
Test build system modified to be similar to uClibc one:
* test custom logic moved from Makefile to a new Makefile.in (to be included
by Makefile).
* Makefile same for all tests and just used for including all other needed
makefiles.
Signed-off-by: Salvatore Cro <salvatore.cro@st.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'test/locale')
-rw-r--r-- | test/locale/Makefile | 30 | ||||
-rw-r--r-- | test/locale/Makefile.in | 29 |
2 files changed, 32 insertions, 27 deletions
diff --git a/test/locale/Makefile b/test/locale/Makefile index 7e408b8cf..771c3d117 100644 --- a/test/locale/Makefile +++ b/test/locale/Makefile @@ -1,31 +1,7 @@ # uClibc locale tests # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. -# tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \ - -TESTS := bug-iconv-trans bug-usesetlocale collate-test dump-ctype \ - gen-unicode-ctype show-ucs-data tst-ctype \ - tst-digits tst-fmon tst-langinfo tst-leaks tst-mbswcs1 \ - tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 tst-mbswcs6 \ - tst_nl_langinfo tst-numeric tst-rpmatch tst-setlocale \ - tst-sscanf tst-strfmon1 tst-trans tst-wctype tst-xlocale1 \ - tst-xlocale2 xfrm-test - - -# NOTE: For now disabled some tests that are known not build -TESTS_DISABLED := tst-ctype tst-fmon tst-leaks tst-rpmatch tst-strfmon1 - -ifneq ($(UCLIBC_HAS_XLOCALE),y) -TESTS_DISABLED += bug-usesetlocale tst-xlocale1 tst-xlocale2 xfrm-test tst-C-locale -endif +top_builddir=../../ +include ../Rules.mak +-include Makefile.in include ../Test.mak - -DODIFF_rint := 1 - -EXTRA_CFLAGS := -D__USE_GNU -fno-builtin - -OPTS_dump-ctype = C -OPTS_tst-ctype = < tst-ctype-de_DE.ISO-8859-1.in -OPTS_tst-langinfo = < tst-langinfo.input - -EXTRA_DIRS := C diff --git a/test/locale/Makefile.in b/test/locale/Makefile.in new file mode 100644 index 000000000..5a57ca54d --- /dev/null +++ b/test/locale/Makefile.in @@ -0,0 +1,29 @@ +# uClibc locale tests +# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. +# tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm \ + +TESTS := bug-iconv-trans bug-usesetlocale collate-test dump-ctype \ + gen-unicode-ctype show-ucs-data tst-ctype \ + tst-digits tst-fmon tst-langinfo tst-leaks tst-mbswcs1 \ + tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 tst-mbswcs6 \ + tst_nl_langinfo tst-numeric tst-rpmatch tst-setlocale \ + tst-sscanf tst-strfmon1 tst-trans tst-wctype tst-xlocale1 \ + tst-xlocale2 xfrm-test + + +# NOTE: For now disabled some tests that are known not build +TESTS_DISABLED := tst-ctype tst-fmon tst-leaks tst-rpmatch tst-strfmon1 + +ifneq ($(UCLIBC_HAS_XLOCALE),y) +TESTS_DISABLED += bug-usesetlocale tst-xlocale1 tst-xlocale2 xfrm-test tst-C-locale +endif + +DODIFF_rint := 1 + +EXTRA_CFLAGS := -D__USE_GNU -fno-builtin + +OPTS_dump-ctype = C +OPTS_tst-ctype = < tst-ctype-de_DE.ISO-8859-1.in +OPTS_tst-langinfo = < tst-langinfo.input + +EXTRA_DIRS := C |