From: Bruno Haible <bruno@clisp.org>
Date: Sat, 18 Feb 2012 22:58:38 +0000 (+0100)
Subject: Avoid test failure with fpc version 2.6.0.
X-Git-Tag: v0.18.2~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9ab5526592699b48f9fb86546e69143372d3405;p=thirdparty%2Fgettext.git

Avoid test failure with fpc version 2.6.0.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 6815ad35b..f42e425eb 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-18  Bruno Haible  <bruno@clisp.org>
+
+	Avoid test failure with fpc version 2.6.0.
+	* lang-rst: Allow a test result with line wrapping.
+
 2012-02-18  Bruno Haible  <bruno@clisp.org>
 
 	Make the lang-pascal test work on x86_64 platforms.
diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst
index 2fe484fe5..ce6a16e2c 100755
--- a/gettext-tools/tests/lang-rst
+++ b/gettext-tools/tests/lang-rst
@@ -65,15 +65,15 @@ ${DIFF} prog.ok prog.pot || exit 1
 
 # The output of rstconv is slightly different:
 # - ModuleName:ConstName instead of ModuleName.ConstName
-# - no line wrapping
+# - no line wrapping in fpc versions < 2.6.0
 # - extra newline at the end
 
 tmpfiles="$tmpfiles prog.pot"
 : ${RSTCONV=rstconv}
 if (${RSTCONV} -o prog.pot -i prog.rst) >/dev/null 2>&1; then
 
-tmpfiles="$tmpfiles prog.ok"
-cat <<EOF > prog.ok
+tmpfiles="$tmpfiles prog.ok1"
+cat <<EOF > prog.ok1
 #: rstconv:help
 msgid "rstconv [-h|--help]    Displays this help\nrstconv options        Convert rst file\n\nOptions are:\n  -i file    Use specified file instead of stdin as input .rst (OPTIONAL)\n  -o file    Write output to specified file (REQUIRED)\n  -f format  Specifies the output format:\n             po    GNU gettext .po (portable) format (DEFAULT)\n"
 msgstr ""
@@ -96,8 +96,40 @@ msgstr ""
 
 EOF
 
+tmpfiles="$tmpfiles prog.ok2"
+cat <<EOF > prog.ok2
+#: rstconv:help
+msgid ""
+"rstconv [-h|--help]    Displays this help\n"
+"rstconv options        Convert rst file\n"
+"\n"
+"Options are:\n"
+"  -i file    Use specified file instead of stdin as input .rst (OPTIONAL)\n"
+"  -o file    Write output to specified file (REQUIRED)\n"
+"  -f format  Specifies the output format:\n"
+"             po    GNU gettext .po (portable) format (DEFAULT)\n"
+msgstr ""
+
+#: rstconv:InvalidOption
+msgid "Invalid option - "
+msgstr ""
+
+#: rstconv:OptionAlreadySpecified
+msgid "Option has already been specified - "
+msgstr ""
+
+#: rstconv:NoOutFilename
+msgid "No output filename specified"
+msgstr ""
+
+#: rstconv:InvalidOutputFormat
+msgid "Invalid output format -"
+msgstr ""
+
+EOF
+
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || exit 1
 
 fi