summary refs log tree commit diff
path: root/catgets/Makefile
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-28 13:57:45 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-28 13:57:45 +0000
commit14d5391f9be3b8fc538fa31303c1c9ceac23cd1a (patch)
tree60901263cf3270a18c74622eaf2c30048ebce3a0 /catgets/Makefile
parentee25ee65c50800db31d0fde1db70338e3c44d8a7 (diff)
downloadglibc-14d5391f9be3b8fc538fa31303c1c9ceac23cd1a.tar.gz
glibc-14d5391f9be3b8fc538fa31303c1c9ceac23cd1a.tar.xz
glibc-14d5391f9be3b8fc538fa31303c1c9ceac23cd1a.zip
Update.
2000-11-28  Ulrich Drepper  <drepper@redhat.com>

	* catgets/gencat.c (normalize_line): Take extra parameter with escape
	character.  Change callers.
	(open_conversion): Determine mapping of 0x5c as wchar_t value.
	* catgets/Makefile: Add rules to build and run test-gencat.
	* catgets/sample.SJIS: New file.
	* catgets/test-gencat.c: New file.
	* catgets/test-gencat.sh: New file.
	Report and test case by Shinya Hanataka <hanataka@abyss.rim.or.jp>.
Diffstat (limited to 'catgets/Makefile')
-rw-r--r--catgets/Makefile14
1 files changed, 12 insertions, 2 deletions
diff --git a/catgets/Makefile b/catgets/Makefile
index caf8eec651..d6b4f0e64b 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -22,13 +22,15 @@
 subdir	:= catgets
 
 headers		= nl_types.h
-distribute	= catgetsinfo.h config.h xopen-msg.sed test1.msg
+distribute	= catgetsinfo.h config.h xopen-msg.sed test1.msg \
+		  test-gencat.sh sample.SJIS
 routines	= catgets open_catalog
 others		= gencat
 install-bin	= gencat
 extra-objs	= $(gencat-modules:=.o)
 
 tests = tst-catgets
+test-srcs = test-gencat
 
 gencat-modules	= xmalloc
 
@@ -49,7 +51,7 @@ generated-dirs = de
 tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de
 
 ifneq ($(cross-compiling),yes)
-tests: $(objpfx)de/libc.cat $(objpfx)test1.cat
+tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test-gencat.out
 # This test just checks whether the program produces any error or not.
 # The result is not tested.
 $(objpfx)test1.cat: test1.msg $(objpfx)gencat
@@ -65,4 +67,12 @@ $(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
 # Generate a non-simple input file.
 $(objpfx)de.msg: $(..)po/de.po
 	sed -f xopen-msg.sed $< > $@
+
+$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
+			  $(objpfx)sample.SJIS.cat
+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
+
+$(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
+	GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+	$(built-program-cmd) < $(word 1,$^) > $@
 endif