tests: Make it easier to single-step the msgfmt-* tests.

* gettext-tools/tests/msgfmt-desktop-1: Assign a default to MSGFMT.
* gettext-tools/tests/msgfmt-desktop-2: Likewise.
* gettext-tools/tests/msgfmt-desktop-3: Likewise.
* gettext-tools/tests/msgfmt-xml-1: Likewise.
* gettext-tools/tests/msgfmt-xml-2: Likewise.
* gettext-tools/tests/msgfmt-xml-3: Likewise.
* gettext-tools/tests/msgfmt-xml-4: Likewise.
* gettext-tools/tests/msgfmt-xml-5: Likewise.

diff --git a/gettext-tools/tests/msgfmt-desktop-1 b/gettext-tools/tests/msgfmt-desktop-1
index a1c71fb18c1b21c953ee8fb363ad32e645985041..548ef52d4cd50afea5a144dfa908d27c8aee69d4 100755 (executable)
--- a/gettext-tools/tests/msgfmt-desktop-1
+++ b/gettext-tools/tests/msgfmt-desktop-1
@@ -67,6 +67,8 @@ Categories=
 NoDisplay=true
 EOF
 
+: ${MSGFMT=msgfmt}
+
 # Sanity checks for contradicting options.
 
 ${MSGFMT} --desktop --template=mf.desktop -l fr fr.po \

diff --git a/gettext-tools/tests/msgfmt-desktop-2 b/gettext-tools/tests/msgfmt-desktop-2
index d131980d8f4fddbaf462ab5704870319c30f3fa9..f8cff377ab71830a87a65f3d0180fea90dc58339 100755 (executable)
--- a/gettext-tools/tests/msgfmt-desktop-2
+++ b/gettext-tools/tests/msgfmt-desktop-2
@@ -127,6 +127,8 @@ EOF
 
 unset LINGUAS
 
+: ${MSGFMT=msgfmt}
+
 # Sanity checks for contradicting options.
 
 ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \

diff --git a/gettext-tools/tests/msgfmt-desktop-3 b/gettext-tools/tests/msgfmt-desktop-3
index 149d9c203a396e2b3b308497eb70fd8d5e91f663..52e07f18de5ab575562446169c0ee14c2d15444a 100755 (executable)
--- a/gettext-tools/tests/msgfmt-desktop-3
+++ b/gettext-tools/tests/msgfmt-desktop-3
@@ -59,6 +59,7 @@ EOF
 
 # Generate the merged .desktop file.
 
+: ${MSGFMT=msgfmt}
 ${MSGFMT} --desktop --template=hello.desktop -l th th.po -o hello.desktop.tmp \
   || Exit 1
 LC_ALL=C tr -d '\r' < hello.desktop.tmp > hello.desktop.out || Exit 1

diff --git a/gettext-tools/tests/msgfmt-xml-1 b/gettext-tools/tests/msgfmt-xml-1
index f4911ad0ba9f3cc8b00039afd8952cc8a0f59bb9..453175d88fd1d0ad979ca8b5823e644c540dfe4c 100755 (executable)
--- a/gettext-tools/tests/msgfmt-xml-1
+++ b/gettext-tools/tests/msgfmt-xml-1
@@ -138,6 +138,8 @@ cat <<\EOF > mf.appdata.xml.ok
 </component>
 EOF
 
+: ${MSGFMT=msgfmt}
+
 # Sanity checks for contradicting options.
 
 ${MSGFMT} --xml --template=mf.appdata.xml -l fr fr.po \

diff --git a/gettext-tools/tests/msgfmt-xml-2 b/gettext-tools/tests/msgfmt-xml-2
index d75b24c02bfc32fb68ff86811939f4cc5cd372ae..58caa28681b393cd0b75b9c2a74dd0fe7f975d11 100755 (executable)
--- a/gettext-tools/tests/msgfmt-xml-2
+++ b/gettext-tools/tests/msgfmt-xml-2
@@ -247,6 +247,8 @@ EOF
 
 unset LINGUAS
 
+: ${MSGFMT=msgfmt}
+
 # Sanity checks for contradicting options.
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out \

diff --git a/gettext-tools/tests/msgfmt-xml-3 b/gettext-tools/tests/msgfmt-xml-3
index 3a13bda67bb50ebd139ea9300ab325a56f63b605..14bf5d4285ffcc5f13fad1c85d37faa2e74df91a 100755 (executable)
--- a/gettext-tools/tests/msgfmt-xml-3
+++ b/gettext-tools/tests/msgfmt-xml-3
@@ -214,6 +214,7 @@ EOF
 
 unset LINGUAS
 
+: ${MSGFMT=msgfmt}
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out || Exit 1
 
 : ${DIFF=diff}

diff --git a/gettext-tools/tests/msgfmt-xml-4 b/gettext-tools/tests/msgfmt-xml-4
index b83a8937adc987ecf5a2240814748b4fcfa96fc8..4896931b0f84f6eea52c194fb793b78136c1c7d7 100755 (executable)
--- a/gettext-tools/tests/msgfmt-xml-4
+++ b/gettext-tools/tests/msgfmt-xml-4
@@ -124,6 +124,8 @@ cat <<\EOF > mf.appdata.xml.ok
 </component>
 EOF
 
+: ${MSGFMT=msgfmt}
+
 # Sanity checks for contradicting options.
 
 ${MSGFMT} --replace-text fr.po \

diff --git a/gettext-tools/tests/msgfmt-xml-5 b/gettext-tools/tests/msgfmt-xml-5
index 156c573f70b3f2fb8b576b7c27337a654bd464c3..a12b97ab8c462d62433ecca252549c61cbde5a96 100755 (executable)
--- a/gettext-tools/tests/msgfmt-xml-5
+++ b/gettext-tools/tests/msgfmt-xml-5
@@ -129,6 +129,7 @@ cat <<\EOF > activipy_tester.de.xml.ok
 </refentry>
 EOF
 
+: ${MSGFMT=msgfmt}
 ${MSGFMT} --xml --template=activipy_tester.xml --replace-text -l de de.po -o activipy_tester.de.xml \
   || Exit 1