intl/tst-gettext: fix failure with newest msgfmt

Since upstream gettext commit d13f165b83 (msgfmt: Remove
POT-Creation-Date field from the header in the output.), msgfmt does not
copy the POT-Creation-Date field in the header entry from the po file to
the mo file anymore. This breaks the assumption that we can test gettext
by comparing each message in the po files with the corresponding string
return by gettext. This makes the intl/tst-gettext to fail.

While it would have been possible to modify the po2test.awk script to
also strip the line POT-Creation-Date field when creating the msgs.h
file, it would not work with both the old and new msgfmt.

Instead create a tst-gettext-de.po file from de.po by removing the
POT-Creation-Date line. Another alternative would be to use a static
tst-gettext-de.po file, but I guess the reason for using de.po is to
also catch issues caused by newly added strings.

As tst-catgets also uses msg.h, it should also be updated. Instead of
using the new tst-gettext-de.po file, the patch modifies xopen-msg.awk
to avoid creating a second catgets->intl dependency.

Changelog:
	[BZ #21508]
	* catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
	* intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
	intl/tst-gettext-de.po from po/de.po by removing the
	POT-Creation-Date line.
	($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
	../po/de.po.
	* intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
	../po/de.po.

diff --git a/ChangeLog b/ChangeLog
index 4e8411f9bf7401312971fa41d68de84e17685c27..9be766b2a1143c73b362f017895a69eb28f01af6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-02-18  Aurelien Jarno  <aurelien@aurel32.net>
+
+       [BZ #21508]
+       * catgets/xopen-msg.awk: Ignore POT-Creation-Date line.
+       * intl/Makefile ($(objpfx)tst-gettext-de.po): Generate
+       intl/tst-gettext-de.po from po/de.po by removing the
+       POT-Creation-Date line.
+       ($(objpfx)msgs.h): Depend on $(objpfx)tst-gettext-de.po instead of
+       ../po/de.po.
+       * intl/tst-gettext.sh: Use ${objpfx}tst-gettext-de.po instead of
+       ../po/de.po.
+
 2018-02-17  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
        * mach/Makefile (headers): Add mach/param.h.

diff --git a/catgets/xopen-msg.awk b/catgets/xopen-msg.awk
index a13d6fa06a7389ac4059a885f50fcb5016844ddb..bab0f6b4efe4def8e36237fb3bddd1603c92a7e6 100644 (file)
--- a/catgets/xopen-msg.awk
+++ b/catgets/xopen-msg.awk
@@ -58,6 +58,11 @@ $1 ~ "msg(id|str)" {
     next
 }
 
+/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"/ {
+    # Ignore POT-Creation-Date to match what is done in intl/Makefile.
+    next
+}
+
 /^".*"/ {
     # Append to current message
     sub(/^"/, "", $0)

diff --git a/intl/Makefile b/intl/Makefile
index 2219717a5aee24c105a0aa81e4d09c563a678d85..672edf1b3874d6b207d2ecb3eb136c0b5ab8fabd 100644 (file)
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -120,7 +120,11 @@ $(objpfx)tst-gettext6.out: $(gen-locales)
 $(objpfx)tst-translit.out: $(gen-locales)
 endif
 
-$(objpfx)msgs.h: po2test.awk ../po/de.po
+$(objpfx)tst-gettext-de.po: ../po/de.po
+       $(make-target-directory)
+       LC_ALL=C $(AWK) '!/^"POT-Creation-Date: [0-9-]+ [0-9:+-]+\\n"$$/' $^ > $@
+
+$(objpfx)msgs.h: po2test.awk $(objpfx)tst-gettext-de.po
        $(make-target-directory)
        LC_ALL=C $(AWK) -f $^ > $@
 

diff --git a/intl/tst-gettext.sh b/intl/tst-gettext.sh
index af9c7d7d922da16845d4ae9376fa2c893784935f..0c65583149ff498efb240945b8dd87c4833bf3d4 100755 (executable)
--- a/intl/tst-gettext.sh
+++ b/intl/tst-gettext.sh
@@ -42,9 +42,9 @@ mkdir -p ${objpfx}domaindir/existing-locale/LC_MESSAGES
 mkdir -p ${objpfx}domaindir/existing-locale/LC_TIME
 # Populate them.
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_MESSAGES/existing-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 msgfmt -o ${objpfx}domaindir/existing-locale/LC_TIME/existing-time-domain.mo \
-       -f ../po/de.po
+       -f ${objpfx}tst-gettext-de.po
 
 # Now run the test.
 ${test_program_prefix_before_env} \