diff options
Diffstat (limited to 'catgets')
| -rw-r--r-- | catgets/Makefile | 4 | ||||
| -rw-r--r-- | catgets/sample.SJIS | 2 | ||||
| -rwxr-xr-x | catgets/test-gencat.sh | 11 |
3 files changed, 13 insertions, 4 deletions
diff --git a/catgets/Makefile b/catgets/Makefile index 8047f8a9fb..677fe424af 100644 --- a/catgets/Makefile +++ b/catgets/Makefile @@ -45,7 +45,7 @@ $(objpfx)gencat: $(gencat-modules:%=$(objpfx)%.o) catgets-CPPFLAGS := -DNLSPATH='"$(msgcatdir)/%L/%N:$(msgcatdir)/%L/LC_MESSAGES/%N:$(msgcatdir)/%l/%N:$(msgcatdir)/%l/LC_MESSAGES/%N:"' \ -DHAVE_CONFIG_H -generated = de.msg test1.cat test1.h sample.SJIS.cat +generated = de.msg test1.cat test1.h sample.SJIS.cat test-gencat.h generated-dirs = de tst-catgets-ENV = NLSPATH="$(objpfx)%l/%N.cat" LANG=de @@ -74,5 +74,5 @@ $(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \ $(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ - $(built-program-cmd) < $(word 1,$^) > $@ + $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@ endif diff --git a/catgets/sample.SJIS b/catgets/sample.SJIS index 9ffcc01ac5..80156e0d2c 100644 --- a/catgets/sample.SJIS +++ b/catgets/sample.SJIS @@ -8,3 +8,5 @@ $set 1 3 sample3:予定表: 4 sample4:TEST\tTAB: 5 sample5:機能\t十種類: +$set Another +FOO "message foo" diff --git a/catgets/test-gencat.sh b/catgets/test-gencat.sh index 99de335c76..d30c6a6f5e 100755 --- a/catgets/test-gencat.sh +++ b/catgets/test-gencat.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test escape character handling in gencat. -# Copyright (C) 2000 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001 Free Software Foundation, Inc. # This file is part of the GNU C Library. # # The GNU C Library is free software; you can redistribute it and/or @@ -36,5 +36,12 @@ sample3:予定表: sample4:TEST TAB: sample5:機能 十種類: EOF +res=$? -exit $? +cat <<EOF | +#define AnotherSet 0x2 /* *standard input*:11 */ +#define AnotherFOO 0x1 /* *standard input*:12 */ +EOF +cmp ${common_objpfx}catgets/test-gencat.h - || res=1 + +exit $res |