Fix tst-gettext test

This commit is contained in:
Andreas Schwab 2012-07-04 14:16:05 +02:00
parent ca61cf32d9
commit 70d35b6769
4 changed files with 55 additions and 53 deletions

View File

@ -1,3 +1,10 @@
2012-07-04 Andreas Schwab <schwab@linux-m68k.org>
* intl/Makefile ($(objpfx)msgs.h): Use po2test.awk instead of
po2text.sed.
* intl/po2test.awk: New file.
* intl/po2test.sed: Removed.
2012-07-04 Joseph Myers <joseph@codesourcery.com>
[BZ #14328]

View File

@ -83,9 +83,9 @@ $(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
endif
endif
$(objpfx)msgs.h: po2test.sed ../po/de.po
$(objpfx)msgs.h: po2test.awk ../po/de.po
$(make-target-directory)
LC_ALL=C sed -f $^ > $@
LC_ALL=C $(AWK) -f $^ > $@
CFLAGS-tst-gettext.c = -DTESTSTRS_H=\"$(objpfx)msgs.h\"
CFLAGS-tst-translit.c = -DOBJPFX=\"$(objpfx)\"

46
intl/po2test.awk Normal file
View File

@ -0,0 +1,46 @@
# po2test.awk - Convert Uniforum style .po file to C code for testing.
# Copyright (C) 2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Output current message (in msg) as argument of the INPUT or OUTPUT macro,
# depending on msgtype
function output_message() {
# Ignore messages containing <PRI.*> markers which would have to be
# replaced by the correct format depending on the word size
if (msg && msg !~ /<PRI.*>/)
printf ("%s(%s)\n", msgtype == "msgid" ? "INPUT" : "OUTPUT", msg)
msg = 0
}
$1 ~ /msg(id|str)/ {
# Output collected message
output_message()
# Collect next message
msgtype = $1
sub(/^msg(id|str)[ \t]*/, "", $0)
msg = $0
next
}
/^".*"/ {
# Append to current message
msg = msg "\n" $0
}
END {
# Output last collected message
output_message()
}

View File

@ -1,51 +0,0 @@
# po2test.sed - Convert Uniforum style .po file to C code for testing.
# Copyright (C) 2000,2003 Free Software Foundation, Inc.
# Ulrich Drepper <drepper@cygnus.com>, 2000.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
#
# We copy the original message as a comment into the .msg file. But enclose
# them with INPUT ( ).
#
s/^msgid[ ]*"\(.*\)"/INPUT ("\1")/
# Clear flag from last substitution and jump if matching
tb
#
# Copy the translations as well and enclose them with OUTPUT ( ).
#
s/^msgstr[ ]*"\(.*\)"/OUTPUT ("\1")/
# Clear flag from last substitution and jump if matching
tb
d
:b
# Append the next line.
$!N
# Check whether second part is a continuation line. If so, before printing
# insert '\'.
s/\(.*\)")\(\n\)"\(.*\)"/\1\\\2\3")/
P
ta
# No, go to the top and process it. Note that `D' includes a jump to the start!!
D
# Yes, we found a continuation line.
:a
# We cannot use the sed command `D' here
s/[^\n]*\n//
# Clear the substitution flag and do the next line.
tb