aboutsummaryrefslogtreecommitdiff
path: root/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog11
-rw-r--r--localedata/Makefile6
-rw-r--r--localedata/tests/test7.cm86
-rw-r--r--localedata/tests/test7.def25
-rw-r--r--localedata/tst-digits.c81
-rwxr-xr-xlocaledata/tst-locale.sh4
6 files changed, 211 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 3125e95..380a53f 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-28 Ulrich Drepper <drepper@redhat.com>
+
+ * Makefile (ld-test-names): Add test7.
+ (tests): Add tst-digits. Add dependency and environment variable.
+ * tst-digits.c: New file.
+ * tst-locale.sh: Generate test7 locale.
+ * tests/test7.cm: New file.
+ * tests/test7.def: New file.
+
+ * tst-locale.sh: Add dropped test6 locale.
+
2000-07-27 Bruno Haible <haible@clisp.cons.org>
* tests-mbwc/tgn_locdef.h (TST_LOC_C): New macro.
diff --git a/localedata/Makefile b/localedata/Makefile
index a5bdca0..e9aec39 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -50,7 +50,7 @@ test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1
test-input-data = $(addsuffix .in, $(basename $(test-input)))
test-output := $(foreach s, .out .xout, \
$(addsuffix $s, $(basename $(test-input))))
-ld-test-names := test1 test2 test3 test4 test5 test6
+ld-test-names := test1 test2 test3 test4 test5 test6 test7
ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
$(addsuffix .def,$(ld-test-names)) \
$(addsuffix .ds,test5 test6) \
@@ -92,7 +92,7 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \
tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans \
tst_wctype tst_wcwidth
-tests = $(locale_test_suite)
+tests = $(locale_test_suite) tst-digits
endif
# Files to install.
@@ -176,6 +176,7 @@ $(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
endif
# Sometimes the whole collection of locale files should be installed.
@@ -241,3 +242,4 @@ tst_wctomb-ENV = $(TEST_MBWC_ENV)
tst_wctrans-ENV = $(TEST_MBWC_ENV)
tst_wctype-ENV = $(TEST_MBWC_ENV)
tst_wcwidth-ENV = $(TEST_MBWC_ENV)
+tst-digits-ENV = $(TEST_MBWC_ENV)
diff --git a/localedata/tests/test7.cm b/localedata/tests/test7.cm
new file mode 100644
index 0000000..207197e
--- /dev/null
+++ b/localedata/tests/test7.cm
@@ -0,0 +1,86 @@
+<code_set_name> test7
+<mb_cur_min> 1
+<mb_cur_max> 3
+
+CHARMAP
+<U0009> \x09
+<U000A> \x0a
+<U000B> \x0b
+<U000C> \x0c
+<U000D> \x0d
+<U0020> \x20
+<U002C> \x2c
+<U002E> \x2e
+<U0030> \x30
+<U0031> \x31
+<U0032> \x32
+<U0033> \x33
+<U0034> \x34
+<U0035> \x35
+<U0036> \x36
+<U0037> \x37
+<U0038> \x38
+<U0039> \x39
+<U0061> \x41
+<U0062> \x42
+<U0063> \x43
+<U0064> \x44
+<U0065> \x45
+<U0066> \x46
+<U0067> \x47
+<U0068> \x48
+<U0069> \x49
+<U006A> \x4A
+<U006B> \x4B
+<U006C> \x4C
+<U006D> \x4D
+<U006E> \x4E
+<U006F> \x4F
+<U0070> \x50
+<U0071> \x51
+<U0072> \x52
+<U0073> \x53
+<U0074> \x54
+<U0075> \x55
+<U0076> \x56
+<U0077> \x57
+<U0078> \x58
+<U0079> \x59
+<U007A> \x5A
+<U0041> \x61
+<U0042> \x62
+<U0043> \x63
+<U0044> \x64
+<U0045> \x65
+<U0046> \x66
+<U0047> \x67
+<U0048> \x68
+<U0049> \x69
+<U004A> \x6a
+<U004B> \x6b
+<U004C> \x6c
+<U004D> \x6d
+<U004E> \x6e
+<U004F> \x6f
+<U0050> \x70
+<U0051> \x71
+<U0052> \x72
+<U0053> \x73
+<U0054> \x74
+<U0055> \x75
+<U0056> \x76
+<U0057> \x77
+<U0058> \x78
+<U0059> \x79
+<U005A> \x7a
+<U2080> \xe2\x82\x80
+<U2081> \xe2\x82\x81
+<U2082> \xe2\x82\x82
+<U2083> \xe2\x82\x83
+<U2084> \xe2\x82\x84
+<U2085> \xe2\x82\x85
+<U2086> \xe2\x82\x86
+<U2087> \xe2\x82\x87
+<U2088> \xe2\x82\x88
+<U2089> \xe2\x82\x89
+END CHARMAP
diff --git a/localedata/tests/test7.def b/localedata/tests/test7.def
new file mode 100644
index 0000000..8f43b36
--- /dev/null
+++ b/localedata/tests/test7.def
@@ -0,0 +1,25 @@
+LC_CTYPE
+lower <U0061>;<U0062>;<U0063>;<U0064>;<U0065>;<U0066>;<U0067>;<U0068>;\
+ <U0069>;<U006A>;<U006B>;<U006C>;<U006D>;<U006E>;<U006F>;<U0070>;\
+ <U0071>;<U0072>;<U0073>;<U0074>;<U0075>;<U0076>;<U0077>;<U0078>;\
+ <U0079>;<U007A>
+
+upper <U0041>;<U0042>;<U0043>;<U0044>;<U0045>;<U0046>;<U0047>;<U0048>;\
+ <U0049>;<U004A>;<U004B>;<U004C>;<U004D>;<U004E>;<U004F>;<U0050>;\
+ <U0051>;<U0052>;<U0053>;<U0054>;<U0055>;<U0056>;<U0057>;<U0058>;\
+ <U0059>;<U005A>
+
+digit <U0030>;<U0031>;<U0032>;<U0033>;<U0034>;\
+ <U0035>;<U0036>;<U0037>;<U0038>;<U0039>;\
+ <U2080>;<U2081>;<U2082>;<U2083>;<U2084>;\
+ <U2085>;<U2086>;<U2087>;<U2088>;<U2089>
+
+outdigit <U2080>;<U2081>;<U2082>;<U2083>;<U2084>;\
+ <U2085>;<U2086>;<U2087>;<U2088>;<U2089>
+END LC_CTYPE
+
+LC_NUMERIC
+decimal_point "<U002E>"
+thousands_sep "<U002C>"
+grouping 3;3
+END LC_NUMERIC
diff --git a/localedata/tst-digits.c b/localedata/tst-digits.c
new file mode 100644
index 0000000..372e8ac
--- /dev/null
+++ b/localedata/tst-digits.c
@@ -0,0 +1,81 @@
+#include <locale.h>
+#include <stdio.h>
+#include <sys/types.h>
+
+
+#define ZERO "\xe2\x82\x80"
+#define ONE "\xe2\x82\x81"
+#define TWO "\xe2\x82\x82"
+#define THREE "\xe2\x82\x83"
+#define FOUR "\xe2\x82\x84"
+#define FIVE "\xe2\x82\x85"
+#define SIX "\xe2\x82\x86"
+#define SEVEN "\xe2\x82\x87"
+#define EIGHT "\xe2\x82\x88"
+#define NINE "\xe2\x82\x89"
+
+static struct printf_int_test
+{
+ int n;
+ const char *format;
+ const char *expected;
+} printf_int_tests[] =
+{
+ { 0, "%I'10d", " " ZERO },
+ { 1, "%I'10d", " " ONE },
+ { 2, "%I'10d", " " TWO },
+ { 3, "%I'10d", " " THREE },
+ { 4, "%I'10d", " " FOUR },
+ { 5, "%I'10d", " " FIVE },
+ { 6, "%I'10d", " " SIX },
+ { 7, "%I'10d", " " SEVEN },
+ { 8, "%I'10d", " " EIGHT },
+ { 9, "%I'10d", " " NINE },
+ { 11, "%I'10d", " " ONE ONE },
+ { 12, "%I'10d", " " ONE TWO },
+ { 123, "%I10d", " " ONE TWO THREE },
+ { 123, "%I'10d", " " ONE TWO THREE },
+ { 1234, "%I10d", ONE TWO THREE FOUR },
+ { 1234, "%I'10d", ONE "," TWO THREE FOUR },
+ { 12345, "%I'10d", ONE TWO "," THREE FOUR FIVE },
+ { 123456, "%I'10d", ONE TWO THREE "," FOUR FIVE SIX },
+ { 1234567, "%I'10d", ONE "," TWO THREE FOUR "," FIVE SIX SEVEN }
+};
+
+
+
+int
+main (void)
+{
+ int cnt;
+ int printf_failures = 0;
+
+ if (setlocale (LC_ALL, "test7") == NULL)
+ {
+ puts ("cannot set locale `test7'");
+ exit (1);
+ }
+
+ /* First: printf tests. */
+ for (cnt = 0; cnt < sizeof (printf_int_tests) / sizeof (printf_int_tests[0]);
+ ++cnt)
+ {
+ char buf[100];
+ ssize_t n;
+
+ n = snprintf (buf, sizeof buf, printf_int_tests[cnt].format,
+ printf_int_tests[cnt].n);
+
+ if (n != strlen (printf_int_tests[cnt].expected)
+ || strcmp (buf, printf_int_tests[cnt].expected) != 0)
+ {
+ printf ("%3d: got \"%s\", expected \"%s\"\n",
+ cnt, buf, printf_int_tests[cnt].expected);
+ ++printf_failures;
+ }
+ }
+
+ printf ("\n%d failures in printf tests\n", printf_failures);
+
+ return printf_failures != 0;
+}
diff --git a/localedata/tst-locale.sh b/localedata/tst-locale.sh
index 4d50311..5aa43e0 100755
--- a/localedata/tst-locale.sh
+++ b/localedata/tst-locale.sh
@@ -40,6 +40,8 @@ test_locale ()
echo "Charmap: \"${charmap}\" Inputfile: \"${input}\"" \
"Outputdir: \"${out}\" failed"
exit 1
+ else
+ echo "locale $out generated succesfully"
fi
}
@@ -49,6 +51,8 @@ test_locale tests/test2.cm tests/test2.def test2
test_locale tests/test3.cm tests/test3.def test3
test_locale tests/test4.cm tests/test4.def test4
test_locale tests/test5.cm tests/test5.def test5 tests/test5.ds
+test_locale tests/test6.cm tests/test6.def test6 tests/test6.ds
+test_locale tests/test7.cm tests/test4.def test7
exit 0
generated by cgit v1.1 at 2024-12-23 11:31:46 +0000