diff options
| author | Andreas Schwab <schwab@suse.de> | 2024-06-10 12:19:17 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2024-08-05 16:49:57 +0200 |
| commit | 1b0a2062c8938c7333cd118d85d9976c4e7c92af (patch) | |
| tree | f83017dc362d09b2284546e53f2a9e26a3f0be66 /iconv/Makefile | |
| parent | 7a630f7d3392ca391a399486ce2846f9e4b4ee63 (diff) | |
| download | glibc-1b0a2062c8938c7333cd118d85d9976c4e7c92af.tar.gz glibc-1b0a2062c8938c7333cd118d85d9976c4e7c92af.tar.xz glibc-1b0a2062c8938c7333cd118d85d9976c4e7c92af.zip | |
iconv: Fix matching of multi-character transliterations (bug 31859)
Only return __GCONV_INCOMPLETE_INPUT for a partial match when the end of the input buffer is reached. Otherwise it is a non-match, and other patterns should be tried.
Diffstat (limited to 'iconv/Makefile')
| -rw-r--r-- | iconv/Makefile | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/iconv/Makefile b/iconv/Makefile index 63afc853ff..65b4a44ab8 100644 --- a/iconv/Makefile +++ b/iconv/Makefile @@ -57,6 +57,10 @@ tests = \ tst-iconv-opt \ # tests +test-srcs := \ + tst-translit-mchar \ + # test-srcs + others = iconv_prog iconvconfig install-others-programs = $(inst_bindir)/iconv install-sbin = iconvconfig @@ -73,6 +77,7 @@ include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left)) ifeq ($(run-built-tests),yes) xtests-special += $(objpfx)test-iconvconfig.out tests-special += $(objpfx)tst-iconv_prog.out +tests-special += $(objpfx)tst-translit-mchar.out endif # Make a copy of the file because gconv module names are constructed @@ -92,6 +97,8 @@ $(objpfx)tst-gconv-init-failure.out: \ $(objpfx)gconv-modules $(objpfx)tst-gconv-init-failure-mod.so endif +generated-dirs += tst-translit + include ../Rules ifeq ($(run-built-tests),yes) @@ -126,3 +133,11 @@ $(objpfx)tst-iconv_prog.out: tst-iconv_prog.sh $(objpfx)iconv_prog $(BASH) $< $(common-objdir) '$(test-wrapper-env)' \ '$(run-program-env)' > $@; \ $(evaluate-test) + +$(objpfx)tst-translit-mchar.out: tst-translit-mchar.sh \ + $(objpfx)tst-translit-mchar \ + tst-translit-locale + $(SHELL) $< $(common-objpfx) '$(run-program-prefix-before-env)' \ + '$(run-program-env)' '$(run-program-prefix-after-env)' \ + $< > $@; \ + $(evaluate-test) |