From 59d9b55bb203ec78be4ace221123e0d1b5827b35 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 8 Jun 2016 15:27:59 +0900
Subject: tests: Use Exit instead of exit if init.sh is used

* gettext-tools/tests/*: Use Exit instead of exit, as suggested by
init.sh.
---
 gettext-tools/tests/autopoint-1            |  36 +++++------
 gettext-tools/tests/autopoint-2            | 100 ++++++++++++++---------------
 gettext-tools/tests/autopoint-3            |  44 ++++++-------
 gettext-tools/tests/cldr-plurals-1         |  12 ++--
 gettext-tools/tests/format-awk-1           |   8 +--
 gettext-tools/tests/format-awk-2           |   4 +-
 gettext-tools/tests/format-boost-1         |   8 +--
 gettext-tools/tests/format-boost-2         |   4 +-
 gettext-tools/tests/format-c-1             |   8 +--
 gettext-tools/tests/format-c-2             |   4 +-
 gettext-tools/tests/format-c-3             |  12 ++--
 gettext-tools/tests/format-c-4             |  12 ++--
 gettext-tools/tests/format-c-5             |  18 +++---
 gettext-tools/tests/format-csharp-1        |   8 +--
 gettext-tools/tests/format-csharp-2        |   4 +-
 gettext-tools/tests/format-elisp-1         |   8 +--
 gettext-tools/tests/format-elisp-2         |   4 +-
 gettext-tools/tests/format-gcc-internal-1  |   8 +--
 gettext-tools/tests/format-gcc-internal-2  |   4 +-
 gettext-tools/tests/format-gfc-internal-1  |   8 +--
 gettext-tools/tests/format-gfc-internal-2  |   4 +-
 gettext-tools/tests/format-java-1          |   8 +--
 gettext-tools/tests/format-java-2          |   4 +-
 gettext-tools/tests/format-javascript-1    |   8 +--
 gettext-tools/tests/format-javascript-2    |   4 +-
 gettext-tools/tests/format-kde-1           |   8 +--
 gettext-tools/tests/format-kde-2           |   4 +-
 gettext-tools/tests/format-kde-kuit-1      |  10 +--
 gettext-tools/tests/format-kde-kuit-2      |   6 +-
 gettext-tools/tests/format-librep-1        |   8 +--
 gettext-tools/tests/format-librep-2        |   4 +-
 gettext-tools/tests/format-lisp-1          |   8 +--
 gettext-tools/tests/format-lisp-2          |   4 +-
 gettext-tools/tests/format-lua-1           |   8 +--
 gettext-tools/tests/format-lua-2           |   4 +-
 gettext-tools/tests/format-pascal-1        |   8 +--
 gettext-tools/tests/format-pascal-2        |   4 +-
 gettext-tools/tests/format-perl-1          |   8 +--
 gettext-tools/tests/format-perl-2          |   4 +-
 gettext-tools/tests/format-perl-brace-1    |   8 +--
 gettext-tools/tests/format-perl-brace-2    |   4 +-
 gettext-tools/tests/format-perl-mixed-1    |   8 +--
 gettext-tools/tests/format-perl-mixed-2    |   4 +-
 gettext-tools/tests/format-php-1           |   8 +--
 gettext-tools/tests/format-php-2           |   4 +-
 gettext-tools/tests/format-python-1        |   8 +--
 gettext-tools/tests/format-python-2        |   4 +-
 gettext-tools/tests/format-python-brace-1  |   8 +--
 gettext-tools/tests/format-python-brace-2  |   4 +-
 gettext-tools/tests/format-qt-1            |   8 +--
 gettext-tools/tests/format-qt-2            |   4 +-
 gettext-tools/tests/format-qt-plural-1     |   8 +--
 gettext-tools/tests/format-qt-plural-2     |   4 +-
 gettext-tools/tests/format-scheme-1        |   8 +--
 gettext-tools/tests/format-scheme-2        |   4 +-
 gettext-tools/tests/format-sh-1            |   8 +--
 gettext-tools/tests/format-sh-2            |   4 +-
 gettext-tools/tests/format-tcl-1           |   8 +--
 gettext-tools/tests/format-tcl-2           |   4 +-
 gettext-tools/tests/format-ycp-1           |   8 +--
 gettext-tools/tests/format-ycp-2           |   4 +-
 gettext-tools/tests/gettext-3              |  12 ++--
 gettext-tools/tests/gettext-4              |   6 +-
 gettext-tools/tests/gettext-5              |  10 +--
 gettext-tools/tests/gettext-6              |  10 +--
 gettext-tools/tests/gettext-7              |  10 +--
 gettext-tools/tests/gettextpo-1            |   8 +--
 gettext-tools/tests/lang-bash              |  40 ++++++------
 gettext-tools/tests/lang-c                 |  28 ++++----
 gettext-tools/tests/lang-c++               |  32 ++++-----
 gettext-tools/tests/lang-clisp             |  38 +++++------
 gettext-tools/tests/lang-csharp            |  38 +++++------
 gettext-tools/tests/lang-elisp             |  14 ++--
 gettext-tools/tests/lang-gawk              |  36 +++++------
 gettext-tools/tests/lang-guile             |  32 ++++-----
 gettext-tools/tests/lang-java              |  38 +++++------
 gettext-tools/tests/lang-javascript        |  36 +++++------
 gettext-tools/tests/lang-librep            |  32 ++++-----
 gettext-tools/tests/lang-lua               |  34 +++++-----
 gettext-tools/tests/lang-objc              |  30 ++++-----
 gettext-tools/tests/lang-pascal            |  28 ++++----
 gettext-tools/tests/lang-perl-1            |  26 ++++----
 gettext-tools/tests/lang-perl-2            |  26 ++++----
 gettext-tools/tests/lang-php               |  34 +++++-----
 gettext-tools/tests/lang-po                |  14 ++--
 gettext-tools/tests/lang-python-1          |  30 ++++-----
 gettext-tools/tests/lang-python-2          |  30 ++++-----
 gettext-tools/tests/lang-rst               |  10 +--
 gettext-tools/tests/lang-sh                |  28 ++++----
 gettext-tools/tests/lang-smalltalk         |  28 ++++----
 gettext-tools/tests/lang-tcl               |  32 ++++-----
 gettext-tools/tests/lang-vala              |  28 ++++----
 gettext-tools/tests/lang-ycp               |  14 ++--
 gettext-tools/tests/msgattrib-1            |   4 +-
 gettext-tools/tests/msgattrib-10           |   4 +-
 gettext-tools/tests/msgattrib-11           |   4 +-
 gettext-tools/tests/msgattrib-12           |   4 +-
 gettext-tools/tests/msgattrib-13           |   4 +-
 gettext-tools/tests/msgattrib-14           |   4 +-
 gettext-tools/tests/msgattrib-15           |   4 +-
 gettext-tools/tests/msgattrib-16           |   4 +-
 gettext-tools/tests/msgattrib-17           |   4 +-
 gettext-tools/tests/msgattrib-18           |   4 +-
 gettext-tools/tests/msgattrib-19           |   4 +-
 gettext-tools/tests/msgattrib-2            |   4 +-
 gettext-tools/tests/msgattrib-3            |   4 +-
 gettext-tools/tests/msgattrib-4            |   4 +-
 gettext-tools/tests/msgattrib-5            |   4 +-
 gettext-tools/tests/msgattrib-6            |   4 +-
 gettext-tools/tests/msgattrib-7            |   4 +-
 gettext-tools/tests/msgattrib-8            |   4 +-
 gettext-tools/tests/msgattrib-9            |   4 +-
 gettext-tools/tests/msgattrib-properties-1 |   4 +-
 gettext-tools/tests/msgcat-1               |   4 +-
 gettext-tools/tests/msgcat-10              |   4 +-
 gettext-tools/tests/msgcat-11              |   4 +-
 gettext-tools/tests/msgcat-12              |   4 +-
 gettext-tools/tests/msgcat-13              |   4 +-
 gettext-tools/tests/msgcat-14              |   4 +-
 gettext-tools/tests/msgcat-15              |   8 +--
 gettext-tools/tests/msgcat-16              |   4 +-
 gettext-tools/tests/msgcat-17              |   4 +-
 gettext-tools/tests/msgcat-18              |   4 +-
 gettext-tools/tests/msgcat-19              |   4 +-
 gettext-tools/tests/msgcat-2               |   4 +-
 gettext-tools/tests/msgcat-20              |   4 +-
 gettext-tools/tests/msgcat-3               |   4 +-
 gettext-tools/tests/msgcat-4               |   4 +-
 gettext-tools/tests/msgcat-5               |   4 +-
 gettext-tools/tests/msgcat-6               |   4 +-
 gettext-tools/tests/msgcat-7               |   4 +-
 gettext-tools/tests/msgcat-8               |   4 +-
 gettext-tools/tests/msgcat-9               |   4 +-
 gettext-tools/tests/msgcat-properties-1    |   4 +-
 gettext-tools/tests/msgcat-properties-2    |   2 +-
 gettext-tools/tests/msgcat-stringtable-1   |   4 +-
 gettext-tools/tests/msgcmp-4               |  12 ++--
 gettext-tools/tests/msgcomm-1              |   4 +-
 gettext-tools/tests/msgcomm-10             |   4 +-
 gettext-tools/tests/msgcomm-11             |   4 +-
 gettext-tools/tests/msgcomm-12             |   4 +-
 gettext-tools/tests/msgcomm-13             |   4 +-
 gettext-tools/tests/msgcomm-14             |   4 +-
 gettext-tools/tests/msgcomm-15             |   2 +-
 gettext-tools/tests/msgcomm-16             |   4 +-
 gettext-tools/tests/msgcomm-17             |   4 +-
 gettext-tools/tests/msgcomm-18             |   4 +-
 gettext-tools/tests/msgcomm-19             |   4 +-
 gettext-tools/tests/msgcomm-2              |   4 +-
 gettext-tools/tests/msgcomm-20             |   4 +-
 gettext-tools/tests/msgcomm-21             |   4 +-
 gettext-tools/tests/msgcomm-22             |   4 +-
 gettext-tools/tests/msgcomm-23             |   4 +-
 gettext-tools/tests/msgcomm-24             |   4 +-
 gettext-tools/tests/msgcomm-25             |   4 +-
 gettext-tools/tests/msgcomm-26             |   4 +-
 gettext-tools/tests/msgcomm-27             |   4 +-
 gettext-tools/tests/msgcomm-28             |   4 +-
 gettext-tools/tests/msgcomm-3              |   4 +-
 gettext-tools/tests/msgcomm-4              |   4 +-
 gettext-tools/tests/msgcomm-5              |   4 +-
 gettext-tools/tests/msgcomm-6              |   4 +-
 gettext-tools/tests/msgcomm-7              |   4 +-
 gettext-tools/tests/msgcomm-8              |   4 +-
 gettext-tools/tests/msgcomm-9              |   4 +-
 gettext-tools/tests/msgconv-1              |   2 +-
 gettext-tools/tests/msgconv-2              |   2 +-
 gettext-tools/tests/msgconv-4              |   2 +-
 gettext-tools/tests/msgconv-5              |   4 +-
 gettext-tools/tests/msgconv-6              |   4 +-
 gettext-tools/tests/msgconv-7              |   2 +-
 gettext-tools/tests/msgen-1                |  10 +--
 gettext-tools/tests/msgen-2                |   4 +-
 gettext-tools/tests/msgen-3                |   4 +-
 gettext-tools/tests/msgen-4                |   4 +-
 gettext-tools/tests/msgexec-1              |   2 +-
 gettext-tools/tests/msgexec-2              |   4 +-
 gettext-tools/tests/msgexec-3              |   2 +-
 gettext-tools/tests/msgexec-4              |   2 +-
 gettext-tools/tests/msgexec-5              |   2 +-
 gettext-tools/tests/msgexec-6              |   2 +-
 gettext-tools/tests/msgfilter-1            |   8 +--
 gettext-tools/tests/msgfilter-2            |   6 +-
 gettext-tools/tests/msgfilter-3            |   8 +--
 gettext-tools/tests/msgfilter-4            |   6 +-
 gettext-tools/tests/msgfilter-5            |   8 +--
 gettext-tools/tests/msgfilter-6            |   2 +-
 gettext-tools/tests/msgfilter-7            |   2 +-
 gettext-tools/tests/msgfilter-8            |   4 +-
 gettext-tools/tests/msgfilter-quote-1      |   8 +--
 gettext-tools/tests/msgfilter-sr-latin-1   |   6 +-
 gettext-tools/tests/msgfmt-1               |   6 +-
 gettext-tools/tests/msgfmt-10              |   2 +-
 gettext-tools/tests/msgfmt-12              |   6 +-
 gettext-tools/tests/msgfmt-14              |   6 +-
 gettext-tools/tests/msgfmt-15              |   8 +--
 gettext-tools/tests/msgfmt-16              |   6 +-
 gettext-tools/tests/msgfmt-17              |   8 +--
 gettext-tools/tests/msgfmt-18              |   4 +-
 gettext-tools/tests/msgfmt-2               |   6 +-
 gettext-tools/tests/msgfmt-3               |   2 +-
 gettext-tools/tests/msgfmt-5               |  10 +--
 gettext-tools/tests/msgfmt-desktop-1       |   6 +-
 gettext-tools/tests/msgfmt-desktop-2       |  18 +++---
 gettext-tools/tests/msgfmt-properties-1    |   6 +-
 gettext-tools/tests/msgfmt-qt-1            |   2 +-
 gettext-tools/tests/msgfmt-qt-2            |   2 +-
 gettext-tools/tests/msgfmt-xml-1           |   8 +--
 gettext-tools/tests/msgfmt-xml-2           |  18 +++---
 gettext-tools/tests/msggrep-1              |   4 +-
 gettext-tools/tests/msggrep-10             |   2 +-
 gettext-tools/tests/msggrep-11             |   4 +-
 gettext-tools/tests/msggrep-2              |   4 +-
 gettext-tools/tests/msggrep-3              |   4 +-
 gettext-tools/tests/msggrep-4              |   4 +-
 gettext-tools/tests/msggrep-5              |   4 +-
 gettext-tools/tests/msggrep-6              |   4 +-
 gettext-tools/tests/msggrep-7              |   4 +-
 gettext-tools/tests/msggrep-8              |   4 +-
 gettext-tools/tests/msggrep-9              |   4 +-
 gettext-tools/tests/msginit-1              |   4 +-
 gettext-tools/tests/msginit-2              |   4 +-
 gettext-tools/tests/msginit-3              |   6 +-
 gettext-tools/tests/msginit-4              |   6 +-
 gettext-tools/tests/msgmerge-1             |   4 +-
 gettext-tools/tests/msgmerge-10            |   4 +-
 gettext-tools/tests/msgmerge-11            |   4 +-
 gettext-tools/tests/msgmerge-12            |   4 +-
 gettext-tools/tests/msgmerge-13            |   4 +-
 gettext-tools/tests/msgmerge-14            |   4 +-
 gettext-tools/tests/msgmerge-15            |   4 +-
 gettext-tools/tests/msgmerge-16            |   4 +-
 gettext-tools/tests/msgmerge-17            |   4 +-
 gettext-tools/tests/msgmerge-18            |  12 ++--
 gettext-tools/tests/msgmerge-19            |  14 ++--
 gettext-tools/tests/msgmerge-20            |   8 +--
 gettext-tools/tests/msgmerge-21            |  10 +--
 gettext-tools/tests/msgmerge-22            |  10 +--
 gettext-tools/tests/msgmerge-23            |  10 +--
 gettext-tools/tests/msgmerge-24            |  12 ++--
 gettext-tools/tests/msgmerge-25            |   4 +-
 gettext-tools/tests/msgmerge-3             |   4 +-
 gettext-tools/tests/msgmerge-4             |   4 +-
 gettext-tools/tests/msgmerge-5             |   4 +-
 gettext-tools/tests/msgmerge-6             |   4 +-
 gettext-tools/tests/msgmerge-7             |   4 +-
 gettext-tools/tests/msgmerge-8             |   4 +-
 gettext-tools/tests/msgmerge-compendium-1  |   4 +-
 gettext-tools/tests/msgmerge-compendium-2  |   4 +-
 gettext-tools/tests/msgmerge-compendium-3  |   4 +-
 gettext-tools/tests/msgmerge-compendium-4  |   4 +-
 gettext-tools/tests/msgmerge-compendium-5  |   4 +-
 gettext-tools/tests/msgmerge-compendium-6  |  50 +++++++--------
 gettext-tools/tests/msgmerge-properties-1  |   4 +-
 gettext-tools/tests/msgmerge-properties-2  |   6 +-
 gettext-tools/tests/msgmerge-update-1      |   2 +-
 gettext-tools/tests/msgmerge-update-2      |   6 +-
 gettext-tools/tests/msgmerge-update-3      |   2 +-
 gettext-tools/tests/msgmerge-update-4      |   2 +-
 gettext-tools/tests/msgunfmt-1             |   6 +-
 gettext-tools/tests/msgunfmt-2             |   6 +-
 gettext-tools/tests/msgunfmt-3             |   4 +-
 gettext-tools/tests/msgunfmt-csharp-1      |  16 ++---
 gettext-tools/tests/msgunfmt-java-1        |  16 ++---
 gettext-tools/tests/msgunfmt-properties-1  |   6 +-
 gettext-tools/tests/msgunfmt-tcl-1         |  10 +--
 gettext-tools/tests/msguniq-1              |   4 +-
 gettext-tools/tests/msguniq-2              |   4 +-
 gettext-tools/tests/msguniq-3              |   4 +-
 gettext-tools/tests/msguniq-4              |   4 +-
 gettext-tools/tests/msguniq-5              |   4 +-
 gettext-tools/tests/msguniq-6              |   4 +-
 gettext-tools/tests/msguniq-7              |   4 +-
 gettext-tools/tests/plural-1               |  38 +++++------
 gettext-tools/tests/plural-2               |   6 +-
 gettext-tools/tests/recode-sr-latin-1      |   6 +-
 gettext-tools/tests/recode-sr-latin-2      |   4 +-
 gettext-tools/tests/sentence-1             |   6 +-
 gettext-tools/tests/xgettext-1             |   2 +-
 gettext-tools/tests/xgettext-10            |   2 +-
 gettext-tools/tests/xgettext-11            |   4 +-
 gettext-tools/tests/xgettext-12            |   4 +-
 gettext-tools/tests/xgettext-13            |   4 +-
 gettext-tools/tests/xgettext-14            |  16 ++---
 gettext-tools/tests/xgettext-2             |   4 +-
 gettext-tools/tests/xgettext-5             |   6 +-
 gettext-tools/tests/xgettext-6             |   4 +-
 gettext-tools/tests/xgettext-7             |   4 +-
 gettext-tools/tests/xgettext-8             |   2 +-
 gettext-tools/tests/xgettext-9             |   4 +-
 gettext-tools/tests/xgettext-appdata-1     |   4 +-
 gettext-tools/tests/xgettext-awk-1         |   4 +-
 gettext-tools/tests/xgettext-awk-2         |   4 +-
 gettext-tools/tests/xgettext-c-1           |   4 +-
 gettext-tools/tests/xgettext-c-10          |   4 +-
 gettext-tools/tests/xgettext-c-11          |   4 +-
 gettext-tools/tests/xgettext-c-12          |   4 +-
 gettext-tools/tests/xgettext-c-13          |   4 +-
 gettext-tools/tests/xgettext-c-14          |   4 +-
 gettext-tools/tests/xgettext-c-15          |   4 +-
 gettext-tools/tests/xgettext-c-16          |   4 +-
 gettext-tools/tests/xgettext-c-17          |   4 +-
 gettext-tools/tests/xgettext-c-18          |   4 +-
 gettext-tools/tests/xgettext-c-19          |   8 +--
 gettext-tools/tests/xgettext-c-2           |   4 +-
 gettext-tools/tests/xgettext-c-20          |  16 ++---
 gettext-tools/tests/xgettext-c-21          |   4 +-
 gettext-tools/tests/xgettext-c-3           |   4 +-
 gettext-tools/tests/xgettext-c-4           |   4 +-
 gettext-tools/tests/xgettext-c-5           |   4 +-
 gettext-tools/tests/xgettext-c-6           |   4 +-
 gettext-tools/tests/xgettext-c-7           |   4 +-
 gettext-tools/tests/xgettext-c-8           |   4 +-
 gettext-tools/tests/xgettext-c-9           |   4 +-
 gettext-tools/tests/xgettext-csharp-1      |   4 +-
 gettext-tools/tests/xgettext-csharp-2      |   2 +-
 gettext-tools/tests/xgettext-csharp-3      |   2 +-
 gettext-tools/tests/xgettext-csharp-4      |   4 +-
 gettext-tools/tests/xgettext-csharp-5      |   4 +-
 gettext-tools/tests/xgettext-csharp-6      |   4 +-
 gettext-tools/tests/xgettext-csharp-7      |   4 +-
 gettext-tools/tests/xgettext-csharp-8      |   2 +-
 gettext-tools/tests/xgettext-desktop-1     |  12 ++--
 gettext-tools/tests/xgettext-elisp-1       |   4 +-
 gettext-tools/tests/xgettext-elisp-2       |   4 +-
 gettext-tools/tests/xgettext-glade-1       |   4 +-
 gettext-tools/tests/xgettext-glade-2       |   4 +-
 gettext-tools/tests/xgettext-glade-3       |   4 +-
 gettext-tools/tests/xgettext-glade-4       |   6 +-
 gettext-tools/tests/xgettext-glade-5       |   8 +--
 gettext-tools/tests/xgettext-glade-6       |   6 +-
 gettext-tools/tests/xgettext-glade-7       |   4 +-
 gettext-tools/tests/xgettext-gsettings-1   |   4 +-
 gettext-tools/tests/xgettext-its-1         |  12 ++--
 gettext-tools/tests/xgettext-its-2         |  10 +--
 gettext-tools/tests/xgettext-java-1        |   4 +-
 gettext-tools/tests/xgettext-java-2        |   2 +-
 gettext-tools/tests/xgettext-java-3        |   4 +-
 gettext-tools/tests/xgettext-java-4        |   4 +-
 gettext-tools/tests/xgettext-java-5        |   4 +-
 gettext-tools/tests/xgettext-java-6        |   4 +-
 gettext-tools/tests/xgettext-java-7        |   4 +-
 gettext-tools/tests/xgettext-javascript-1  |   2 +-
 gettext-tools/tests/xgettext-javascript-2  |   2 +-
 gettext-tools/tests/xgettext-javascript-3  |   2 +-
 gettext-tools/tests/xgettext-javascript-4  |   2 +-
 gettext-tools/tests/xgettext-javascript-5  |   2 +-
 gettext-tools/tests/xgettext-javascript-6  |   2 +-
 gettext-tools/tests/xgettext-librep-1      |   4 +-
 gettext-tools/tests/xgettext-librep-2      |   4 +-
 gettext-tools/tests/xgettext-lisp-1        |   4 +-
 gettext-tools/tests/xgettext-lisp-2        |   4 +-
 gettext-tools/tests/xgettext-lua-1         |   4 +-
 gettext-tools/tests/xgettext-lua-2         |   4 +-
 gettext-tools/tests/xgettext-objc-1        |   4 +-
 gettext-tools/tests/xgettext-objc-2        |   4 +-
 gettext-tools/tests/xgettext-perl-1        |   4 +-
 gettext-tools/tests/xgettext-perl-2        |   2 +-
 gettext-tools/tests/xgettext-perl-3        |   2 +-
 gettext-tools/tests/xgettext-perl-4        |   4 +-
 gettext-tools/tests/xgettext-perl-5        |   4 +-
 gettext-tools/tests/xgettext-perl-6        |   4 +-
 gettext-tools/tests/xgettext-perl-7        |   4 +-
 gettext-tools/tests/xgettext-perl-8        |   4 +-
 gettext-tools/tests/xgettext-php-1         |   4 +-
 gettext-tools/tests/xgettext-php-2         |  20 +++---
 gettext-tools/tests/xgettext-php-3         |   4 +-
 gettext-tools/tests/xgettext-php-4         |   4 +-
 gettext-tools/tests/xgettext-po-1          |   4 +-
 gettext-tools/tests/xgettext-properties-1  |   4 +-
 gettext-tools/tests/xgettext-python-1      |   2 +-
 gettext-tools/tests/xgettext-python-2      |   4 +-
 gettext-tools/tests/xgettext-python-3      |  20 +++---
 gettext-tools/tests/xgettext-python-4      |   4 +-
 gettext-tools/tests/xgettext-scheme-1      |   4 +-
 gettext-tools/tests/xgettext-scheme-2      |   2 +-
 gettext-tools/tests/xgettext-scheme-3      |   4 +-
 gettext-tools/tests/xgettext-scheme-4      |   4 +-
 gettext-tools/tests/xgettext-sh-1          |   4 +-
 gettext-tools/tests/xgettext-sh-2          |   4 +-
 gettext-tools/tests/xgettext-sh-3          |   4 +-
 gettext-tools/tests/xgettext-sh-4          |   4 +-
 gettext-tools/tests/xgettext-sh-5          |   4 +-
 gettext-tools/tests/xgettext-sh-6          |   4 +-
 gettext-tools/tests/xgettext-smalltalk-1   |   4 +-
 gettext-tools/tests/xgettext-smalltalk-2   |   4 +-
 gettext-tools/tests/xgettext-stringtable-1 |   2 +-
 gettext-tools/tests/xgettext-tcl-1         |   2 +-
 gettext-tools/tests/xgettext-tcl-2         |   4 +-
 gettext-tools/tests/xgettext-tcl-3         |   4 +-
 gettext-tools/tests/xgettext-tcl-4         |   2 +-
 gettext-tools/tests/xgettext-vala-1        |   6 +-
 gettext-tools/tests/xgettext-ycp-1         |   4 +-
 gettext-tools/tests/xgettext-ycp-2         |   4 +-
 gettext-tools/tests/xgettext-ycp-3         |   4 +-
 gettext-tools/tests/xgettext-ycp-4         |   4 +-
 396 files changed, 1438 insertions(+), 1438 deletions(-)

diff --git a/gettext-tools/tests/autopoint-1 b/gettext-tools/tests/autopoint-1
index 1a6be8f..499c1f7 100755
--- a/gettext-tools/tests/autopoint-1
+++ b/gettext-tools/tests/autopoint-1
@@ -5,14 +5,14 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
@@ -23,11 +23,11 @@ export gettext_datadir
 
 # no configure.ac
 $gettext_datadir/autopoint 2>&1 | grep 'Missing configure.in or configure.ac' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # configure.ac without AM_GNU_GETTEXT_VERSION
 cat <<\EOF >configure.ac
@@ -41,11 +41,11 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # VERSION specified through intl/VERSION file, but in wrong format
 cat <<\EOF >configure.ac
@@ -62,10 +62,10 @@ test -d intl || mkdir intl
 echo bogus-version > intl/VERSION
 
 $gettext_datadir/autopoint 2>&1 | grep 'Missing version' 2>&1 >/dev/null \
-    || exit 1
+    || Exit 1
 
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 # VERSION specified through intl/VERSION file
 cat <<\EOF >configure.ac
@@ -84,15 +84,15 @@ echo gettext-0.15 > intl/VERSION
 
 # For further investigation, autopoint keeps autopoint.diff in $TMPDIR
 # if there is a mismatch.  Set TMPDIR not to pollute /tmp.
-TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 | grep 'locally modified' 2>&1 >/dev/null || exit 1
+TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 | grep 'locally modified' 2>&1 >/dev/null || Exit 1
 
-test ! -d m4 || exit 1
-test ! -d po || exit 1
+test ! -d m4 || Exit 1
+test ! -d po || Exit 1
 
 echo 'GNU gettext library from gettext-0.15' > intl/VERSION
 
-TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 || exit 1
+TMPDIR="$PWD" $gettext_datadir/autopoint 2>&1 || Exit 1
 
 rm -fr intl
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/autopoint-2 b/gettext-tools/tests/autopoint-2
index 740937a..e86a7f3 100755
--- a/gettext-tools/tests/autopoint-2
+++ b/gettext-tools/tests/autopoint-2
@@ -5,14 +5,14 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
@@ -35,16 +35,16 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
-test -d build-aux || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
+test -d build-aux || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
-test -f build-aux/config.rpath || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
+test -f build-aux/config.rpath || Exit 1
 
 rm -fr m4 po
 
@@ -63,15 +63,15 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f intl/VERSION || exit 1
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f intl/VERSION || Exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr intl m4 po
 
@@ -96,15 +96,15 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test ! -d m4 || exit 1
-test -d gettext-m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test ! -d m4 || Exit 1
+test -d gettext-m4 || Exit 1
+test -d po || Exit 1
 
-test -f gettext-m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f gettext-m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr gettext-m4 po
 
@@ -124,14 +124,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr m4 po
 
@@ -156,14 +156,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 rm -fr m4 po
 
@@ -182,14 +182,14 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test ! -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test ! -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 # Check for the case where both AM_GNU_GETTEXT_REQUIRE_VERSION and
 # AM_GNU_GETTEXT_VERSION are used.
@@ -211,18 +211,18 @@ AC_OUTPUT
 EOF
 
 $gettext_datadir/autopoint >autopoint.out 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-grep 'using AM_GNU_GETTEXT_REQUIRE_VERSION' autopoint.out 2>&1 >/dev/null || exit 1
+grep 'using AM_GNU_GETTEXT_REQUIRE_VERSION' autopoint.out 2>&1 >/dev/null || Exit 1
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
 cat >autopoint.ver <<EOF
 GNU gettext library from gettext-$ARCHIVE_VERSION
 EOF
 : ${DIFF=diff}
-${DIFF} autopoint.ver intl/VERSION || exit 1
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+${DIFF} autopoint.ver intl/VERSION || Exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
index c0f468c..722910b 100755
--- a/gettext-tools/tests/autopoint-3
+++ b/gettext-tools/tests/autopoint-3
@@ -5,20 +5,20 @@
 
 : ${AUTOCONF=autoconf}
 ${AUTOCONF} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf not found"; exit 77; }
+  || { echo "Skipping test: autoconf not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
 EOF
 
 ${AUTOCONF} >/dev/null 2>/dev/null \
-  || { echo "Skipping test: autoconf version too old"; exit 77; }
+  || { echo "Skipping test: autoconf version too old"; Exit 77; }
 
 rm -f configure.ac
 
 : ${AUTOMAKE=automake}
 ${AUTOMAKE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: automake not found"; exit 77; }
+  || { echo "Skipping test: automake not found"; Exit 77; }
 
 cat <<\EOF >configure.ac
 AC_PREREQ([2.60])
@@ -30,22 +30,22 @@ EOF
 
 : ${ACLOCAL=aclocal}
 ${ACLOCAL} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 : > Makefile.am
 
 ${AUTOMAKE} --add-missing >/dev/null 2>/dev/null \
-  || { echo "Skipping test: automake version too old"; exit 77; }
+  || { echo "Skipping test: automake version too old"; Exit 77; }
 
 rm -f configure.ac Makefile.am
 
 : ${LIBTOOLIZE=libtoolize}
 ${LIBTOOLIZE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: libtoolize not found"; exit 77; }
+  || { echo "Skipping test: libtoolize not found"; Exit 77; }
 
 : ${MAKE=make}
 ${MAKE} --version >/dev/null 2>/dev/null \
-  || { echo "Skipping test: make not found"; exit 77; }
+  || { echo "Skipping test: make not found"; Exit 77; }
 
 gettext_datadir=$top_builddir/misc
 export gettext_datadir
@@ -97,43 +97,43 @@ cp -p "$abs_top_srcdir"/gnulib-lib/gettext.h .
 cp -p "$abs_top_srcdir"/examples/hello-c/hello.c .
 
 $gettext_datadir/autopoint -f >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-test -d intl || exit 1
-test -d m4 || exit 1
-test -d po || exit 1
+test -d intl || Exit 1
+test -d m4 || Exit 1
+test -d po || Exit 1
 
-test -f m4/po.m4 || exit 1
-test -f po/Makefile.in.in || exit 1
+test -f m4/po.m4 || Exit 1
+test -f po/Makefile.in.in || Exit 1
 
 cp -p po/Makevars.template po/Makevars
 echo hello.c > po/POTFILES.in
 
 ${LIBTOOLIZE} -f -i >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${ACLOCAL} -I m4 >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 : ${AUTOHEADER=autoheader}
 ${AUTOHEADER} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${AUTOCONF} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${AUTOMAKE} -a -c >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 # Check if libintl compiles.
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} ./configure --with-included-gettext >/dev/null 2>autpoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${MAKE} >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
 ${MAKE} dist >/dev/null 2>autopoint.err
-test $? = 0 || { cat autopoint.err; exit 1; }
+test $? = 0 || { cat autopoint.err; Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/cldr-plurals-1 b/gettext-tools/tests/cldr-plurals-1
index e593812..18a8b61 100755
--- a/gettext-tools/tests/cldr-plurals-1
+++ b/gettext-tools/tests/cldr-plurals-1
@@ -8,7 +8,7 @@
 LC_ALL=C "$top_builddir/src/cldr-plurals" ru /dev/null 2>&1 | grep 'extraction is not supported' > /dev/null 2>&1
 test $? = 0 && {
   echo "Skipping test: cldr-plurals was built without XML support"
-  exit 77
+  Exit 77
 }
 
 cat > ar.ok <<\EOF
@@ -19,7 +19,7 @@ EOF
 zero: n = 0 @integer 0 @decimal 0.0, 0.00, 0.000, 0.0000; one: n = 1 @integer 1 @decimal 1.0, 1.00, 1.000, 1.0000; two: n = 2 @integer 2 @decimal 2.0, 2.00, 2.000, 2.0000; few: n % 100 = 3..10 @integer 3~10, 103~110, 1003, … @decimal 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 103.0, 1003.0, …; many: n % 100 = 11..99 @integer 11~26, 111, 1011, … @decimal 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0, 18.0, 111.0, 1011.0, …; other:  @integer 100~102, 200~202, 300~302, 400~402, 500~502, 600, 1000, 10000, 100000, 1000000, … @decimal 0.1~0.9, 1.1~1.7, 10.1, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
 
-${DIFF} ar.ok ar.out || exit 1
+${DIFF} ar.ok ar.out || Exit 1
 
 cat > ru.ok <<\EOF
 nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);
@@ -29,7 +29,7 @@ EOF
 one: v = 0 and i % 10 = 1 and i % 100 != 11 @integer 1, 21, 31, 41, 51, 61, 71, 81, 101, 1001, …; few: v = 0 and i % 10 = 2..4 and i % 100 != 12..14 @integer 2~4, 22~24, 32~34, 42~44, 52~54, 62, 102, 1002, …; many: v = 0 and i % 10 = 0 or v = 0 and i % 10 = 5..9 or v = 0 and i % 100 = 11..14 @integer 0, 5~19, 100, 1000, 10000, 100000, 1000000, …; other:    @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
 
-${DIFF} ru.ok ru.out || exit 1
+${DIFF} ru.ok ru.out || Exit 1
 
 # Test extraction from CLDR
 
@@ -48,12 +48,12 @@ EOF
 cat > foo.ok <<\EOF
 nplurals=2; plural=(n != 1);
 EOF
-${DIFF} foo.ok foo.out || exit 1
+${DIFF} foo.ok foo.out || Exit 1
 
 "$top_builddir/src/cldr-plurals" -c foo foo.in > foo.cldr.out
 cat > foo.cldr.ok <<\EOF
 one: i = 1 and v = 0 @integer 1; other:  @integer 0, 2~16, 100, 1000, 10000, 100000, 1000000, … @decimal 0.0~1.5, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0, …
 EOF
-${DIFF} foo.cldr.ok foo.cldr.out || exit 1
+${DIFF} foo.cldr.ok foo.cldr.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-awk-1 b/gettext-tools/tests/format-awk-1
index 0baa275..ce423cb 100755
--- a/gettext-tools/tests/format-awk-1
+++ b/gettext-tools/tests/format-awk-1
@@ -106,8 +106,8 @@ while read comment; do
   cat <<EOF > f-a-1-$n.in
 dcgettext(${string});
 EOF
-  ${XGETTEXT} -L awk -o f-a-1-$n.po f-a-1-$n.in || exit 1
-  test -f f-a-1-$n.po || exit 1
+  ${XGETTEXT} -L awk -o f-a-1-$n.po f-a-1-$n.in || Exit 1
+  test -f f-a-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep awk-format f-a-1-$n.po > /dev/null; then
@@ -127,9 +127,9 @@ EOF
     cat f-a-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-a-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-a-1-$n.in f-a-1-$n.po
 done < f-a-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-awk-2 b/gettext-tools/tests/format-awk-2
index feaaf82..6a458bb 100755
--- a/gettext-tools/tests/format-awk-2
+++ b/gettext-tools/tests/format-awk-2
@@ -131,9 +131,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-a-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-a-2-$n.po f-a-2-$n.mo
 done < f-a-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-boost-1 b/gettext-tools/tests/format-boost-1
index a9d4ad9..717a796 100755
--- a/gettext-tools/tests/format-boost-1
+++ b/gettext-tools/tests/format-boost-1
@@ -280,8 +280,8 @@ while read comment; do
   cat <<EOF > f-bo-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L C++ --boost -o f-bo-1-$n.po f-bo-1-$n.in || exit 1
-  test -f f-bo-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --boost -o f-bo-1-$n.po f-bo-1-$n.in || Exit 1
+  test -f f-bo-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep boost-format f-bo-1-$n.po > /dev/null; then
@@ -301,9 +301,9 @@ EOF
     cat f-bo-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-bo-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-bo-1-$n.in f-bo-1-$n.po
 done < f-bo-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-boost-2 b/gettext-tools/tests/format-boost-2
index b41b7b0..c97a4b1 100755
--- a/gettext-tools/tests/format-boost-2
+++ b/gettext-tools/tests/format-boost-2
@@ -197,9 +197,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-bo-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-bo-2-$n.po f-bo-2-$n.mo
 done < f-bo-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-1 b/gettext-tools/tests/format-c-1
index 8150abf..83ba0ca 100755
--- a/gettext-tools/tests/format-c-1
+++ b/gettext-tools/tests/format-c-1
@@ -130,8 +130,8 @@ while read comment; do
   cat <<EOF > f-c-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L C -o f-c-1-$n.po f-c-1-$n.in || exit 1
-  test -f f-c-1-$n.po || exit 1
+  ${XGETTEXT} -L C -o f-c-1-$n.po f-c-1-$n.in || Exit 1
+  test -f f-c-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep c-format f-c-1-$n.po > /dev/null; then
@@ -151,9 +151,9 @@ EOF
     cat f-c-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-c-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-c-1-$n.in f-c-1-$n.po
 done < f-c-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-2 b/gettext-tools/tests/format-c-2
index e7793e0..4883a27 100755
--- a/gettext-tools/tests/format-c-2
+++ b/gettext-tools/tests/format-c-2
@@ -299,9 +299,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-c-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-c-2-$n.po f-c-2-$n.mo
 done < f-c-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-c-3 b/gettext-tools/tests/format-c-3
index b72da21..0509e1f 100755
--- a/gettext-tools/tests/format-c-3
+++ b/gettext-tools/tests/format-c-3
@@ -4,8 +4,8 @@
 # Test ISO C 99 <inttypes.h> format string directives.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || exit 1
+${XGETTEXT} -o fc3.tmp --omit-header --no-location "$abs_srcdir"/format-c-3-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc3.tmp > fc3.pot || Exit 1
 
 cat <<EOF > fc3.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc3.ok fc3.pot || exit 1
+${DIFF} fc3.ok fc3.pot || Exit 1
 
 cat <<EOF > fc3-de.po
 #, c-format
@@ -30,11 +30,11 @@ test -d fc3-dir/de/LC_MESSAGES || mkdir fc3-dir/de/LC_MESSAGES
 ${MSGFMT} -o fc3-dir/de/LC_MESSAGES/fc3.mo fc3-de.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo || exit 1
-LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || exit 1
+${MSGUNFMT} -o fc3-de.po.tmp fc3-dir/de/LC_MESSAGES/fc3.mo || Exit 1
+LC_ALL=C tr -d '\r' < fc3-de.po.tmp > fc3-de.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fc3-de.po fc3-de.po.un || exit 1
+${DIFF} fc3-de.po fc3-de.po.un || Exit 1
 
 LANGUAGE= ../fc3 de_DE
 result=$?
diff --git a/gettext-tools/tests/format-c-4 b/gettext-tools/tests/format-c-4
index edfdc4e..3ab9ddc 100755
--- a/gettext-tools/tests/format-c-4
+++ b/gettext-tools/tests/format-c-4
@@ -4,8 +4,8 @@
 # Test ISO C 99 <inttypes.h> format string directives with plural forms.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || exit 1
+${XGETTEXT} -o fc4.tmp --omit-header --no-location "$abs_srcdir"/format-c-4-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc4.tmp > fc4.pot || Exit 1
 
 cat <<EOF > fc4.ok
 #, c-format
@@ -16,7 +16,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc4.ok fc4.pot || exit 1
+${DIFF} fc4.ok fc4.pot || Exit 1
 
 cat <<EOF > fc4-de.po
 #, c-format
@@ -34,11 +34,11 @@ test -d fc4-dir/de/LC_MESSAGES || mkdir fc4-dir/de/LC_MESSAGES
 ${MSGFMT} -o fc4-dir/de/LC_MESSAGES/fc4.mo fc4-de.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo || exit 1
-LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || exit 1
+${MSGUNFMT} -o fc4-de.po.tmp fc4-dir/de/LC_MESSAGES/fc4.mo || Exit 1
+LC_ALL=C tr -d '\r' < fc4-de.po.tmp > fc4-de.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fc4-de.po fc4-de.po.un || exit 1
+${DIFF} fc4-de.po fc4-de.po.un || Exit 1
 
 LANGUAGE= ../fc4 de_DE
 result=$?
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 7868785..9192967 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -4,8 +4,8 @@
 # Test 'I' format directive flag.
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || exit 1
-LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || exit 1
+${XGETTEXT} -o fc5.tmp --omit-header --no-location "$abs_srcdir"/format-c-5-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < fc5.tmp > fc5.pot || Exit 1
 
 cat <<EOF > fc5.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} fc5.ok fc5.pot || exit 1
+${DIFF} fc5.ok fc5.pot || Exit 1
 
 # This should better be Farsi, not German. Can some translator help me?
 cat <<EOF > fa.po
@@ -30,11 +30,11 @@ test -d fa/LC_MESSAGES || mkdir fa/LC_MESSAGES
 ${MSGFMT} -o fa/LC_MESSAGES/fc5.mo fa.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo || exit 1
-LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un || exit 1
+${MSGUNFMT} -o fa.po.tmp fa/LC_MESSAGES/fc5.mo || Exit 1
+LC_ALL=C tr -d '\r' < fa.po.tmp > fa.po.un || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fa.po fa.po.un || exit 1
+${DIFF} fa.po fa.po.un || Exit 1
 
 LANGUAGE= ../fc5 fa_IR
 case $? in
@@ -45,8 +45,8 @@ case $? in
     else
       echo "Skipping test: locale fa_IR not supported"
     fi
-    exit 77;;
-  *) exit 1;;
+    Exit 77;;
+  *) Exit 1;;
 esac
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-csharp-1 b/gettext-tools/tests/format-csharp-1
index 792165a..0bd4a23 100755
--- a/gettext-tools/tests/format-csharp-1
+++ b/gettext-tools/tests/format-csharp-1
@@ -54,8 +54,8 @@ while read comment; do
   cat <<EOF > f-cs-1-$n.in
 GetString(${string});
 EOF
-  ${XGETTEXT} -L C# -o f-cs-1-$n.po f-cs-1-$n.in || exit 1
-  test -f f-cs-1-$n.po || exit 1
+  ${XGETTEXT} -L C# -o f-cs-1-$n.po f-cs-1-$n.in || Exit 1
+  test -f f-cs-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep csharp-format f-cs-1-$n.po > /dev/null; then
@@ -75,9 +75,9 @@ EOF
     cat f-cs-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-cs-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-cs-1-$n.in f-cs-1-$n.po
 done < f-cs-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-csharp-2 b/gettext-tools/tests/format-csharp-2
index cc68575..6b63dc8 100755
--- a/gettext-tools/tests/format-csharp-2
+++ b/gettext-tools/tests/format-csharp-2
@@ -65,9 +65,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-cs-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-cs-2-$n.po f-cs-2-$n.mo
 done < f-cs-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-elisp-1 b/gettext-tools/tests/format-elisp-1
index 918530a..f95dda0 100755
--- a/gettext-tools/tests/format-elisp-1
+++ b/gettext-tools/tests/format-elisp-1
@@ -102,8 +102,8 @@ while read comment; do
   cat <<EOF > f-el-1-$n.in
 (_ ${string});
 EOF
-  ${XGETTEXT} -L EmacsLisp -o f-el-1-$n.po f-el-1-$n.in || exit 1
-  test -f f-el-1-$n.po || exit 1
+  ${XGETTEXT} -L EmacsLisp -o f-el-1-$n.po f-el-1-$n.in || Exit 1
+  test -f f-el-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep elisp-format f-el-1-$n.po > /dev/null; then
@@ -123,9 +123,9 @@ EOF
     cat f-el-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-el-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-el-1-$n.in f-el-1-$n.po
 done < f-el-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-elisp-2 b/gettext-tools/tests/format-elisp-2
index d4b1e6a..de0d118 100755
--- a/gettext-tools/tests/format-elisp-2
+++ b/gettext-tools/tests/format-elisp-2
@@ -281,9 +281,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-el-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-el-2-$n.po f-el-2-$n.mo
 done < f-el-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gcc-internal-1 b/gettext-tools/tests/format-gcc-internal-1
index 92c931b..b0f3dd8 100755
--- a/gettext-tools/tests/format-gcc-internal-1
+++ b/gettext-tools/tests/format-gcc-internal-1
@@ -134,8 +134,8 @@ while read comment; do
   cat <<EOF > f-gi-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L GCC-source -o f-gi-1-$n.po f-gi-1-$n.in || exit 1
-  test -f f-gi-1-$n.po || exit 1
+  ${XGETTEXT} -L GCC-source -o f-gi-1-$n.po f-gi-1-$n.in || Exit 1
+  test -f f-gi-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep gcc-internal-format f-gi-1-$n.po > /dev/null; then
@@ -155,9 +155,9 @@ EOF
     cat f-gi-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-gi-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gi-1-$n.in f-gi-1-$n.po
 done < f-gi-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gcc-internal-2 b/gettext-tools/tests/format-gcc-internal-2
index 3034f24..c0b6045 100755
--- a/gettext-tools/tests/format-gcc-internal-2
+++ b/gettext-tools/tests/format-gcc-internal-2
@@ -530,9 +530,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-gi-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gi-2-$n.po f-gi-2-$n.mo
 done < f-gi-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gfc-internal-1 b/gettext-tools/tests/format-gfc-internal-1
index fc0c44c..da26e76 100755
--- a/gettext-tools/tests/format-gfc-internal-1
+++ b/gettext-tools/tests/format-gfc-internal-1
@@ -74,8 +74,8 @@ while read comment; do
   cat <<EOF > f-gf-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L GCC-source -o f-gf-1-$n.po f-gf-1-$n.in || exit 1
-  test -f f-gf-1-$n.po || exit 1
+  ${XGETTEXT} -L GCC-source -o f-gf-1-$n.po f-gf-1-$n.in || Exit 1
+  test -f f-gf-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep gfc-internal-format f-gf-1-$n.po > /dev/null; then
@@ -95,9 +95,9 @@ EOF
     cat f-gf-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-gf-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gf-1-$n.in f-gf-1-$n.po
 done < f-gf-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-gfc-internal-2 b/gettext-tools/tests/format-gfc-internal-2
index f89fece..2c417b4 100755
--- a/gettext-tools/tests/format-gfc-internal-2
+++ b/gettext-tools/tests/format-gfc-internal-2
@@ -170,9 +170,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-gf-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-gf-2-$n.po f-gf-2-$n.mo
 done < f-gf-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-java-1 b/gettext-tools/tests/format-java-1
index ecf56dd..465e93b 100755
--- a/gettext-tools/tests/format-java-1
+++ b/gettext-tools/tests/format-java-1
@@ -124,8 +124,8 @@ while read comment; do
   cat <<EOF > f-j-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Java -o f-j-1-$n.po f-j-1-$n.in || exit 1
-  test -f f-j-1-$n.po || exit 1
+  ${XGETTEXT} -L Java -o f-j-1-$n.po f-j-1-$n.in || Exit 1
+  test -f f-j-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep java-format f-j-1-$n.po > /dev/null; then
@@ -145,9 +145,9 @@ EOF
     cat f-j-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-j-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-j-1-$n.in f-j-1-$n.po
 done < f-j-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-java-2 b/gettext-tools/tests/format-java-2
index e363e92..dfef92e 100755
--- a/gettext-tools/tests/format-java-2
+++ b/gettext-tools/tests/format-java-2
@@ -134,9 +134,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-j-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-j-2-$n.po f-j-2-$n.mo
 done < f-j-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-javascript-1 b/gettext-tools/tests/format-javascript-1
index 0b8db0c..c0a4aa3 100755
--- a/gettext-tools/tests/format-javascript-1
+++ b/gettext-tools/tests/format-javascript-1
@@ -68,8 +68,8 @@ gettext(${string});
 EOF
   # Hide xgettext's "The translator cannot reorder the arguments." warnings.
   ${XGETTEXT} -L JavaScript -o f-js-1-$n.po f-js-1-$n.in 2> f-js-1.err \
-    || { cat f-js-1.err 1>&2; exit 1; }
-  test -f f-js-1-$n.po || exit 1
+    || { cat f-js-1.err 1>&2; Exit 1; }
+  test -f f-js-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep javascript-format f-js-1-$n.po > /dev/null; then
@@ -89,9 +89,9 @@ EOF
     cat f-js-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-js-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-js-1-$n.in f-js-1-$n.po
 done < f-js-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-javascript-2 b/gettext-tools/tests/format-javascript-2
index e613ef8..62113ca 100755
--- a/gettext-tools/tests/format-javascript-2
+++ b/gettext-tools/tests/format-javascript-2
@@ -74,9 +74,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-js-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-js-2-$n.po f-js-2-$n.mo
 done < f-js-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-1 b/gettext-tools/tests/format-kde-1
index 1b4dafc..640fbca 100755
--- a/gettext-tools/tests/format-kde-1
+++ b/gettext-tools/tests/format-kde-1
@@ -48,8 +48,8 @@ while read comment; do
   cat <<EOF > f-kd-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --kde -k_ -o f-kd-1-$n.po f-kd-1-$n.in || exit 1
-  test -f f-kd-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --kde -k_ -o f-kd-1-$n.po f-kd-1-$n.in || Exit 1
+  test -f f-kd-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep kde-format f-kd-1-$n.po > /dev/null; then
@@ -69,9 +69,9 @@ EOF
     cat f-kd-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-kd-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-1-$n.in f-kd-1-$n.po
 done < f-kd-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-2 b/gettext-tools/tests/format-kde-2
index 9fb96f5..8f9ddab 100755
--- a/gettext-tools/tests/format-kde-2
+++ b/gettext-tools/tests/format-kde-2
@@ -95,9 +95,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-kd-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-2-$n.po f-kd-2-$n.mo
 done < f-kd-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-kuit-1 b/gettext-tools/tests/format-kde-kuit-1
index aeaa743..23edc9c 100755
--- a/gettext-tools/tests/format-kde-kuit-1
+++ b/gettext-tools/tests/format-kde-kuit-1
@@ -12,7 +12,7 @@ EOF
 LC_ALL=C ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format -o - f-kd-invalid.cpp 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1
 test $? = 0 || {
   echo "Skipping test: xgettext was built without KDE KUIT format support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > f-kd-1.data
@@ -43,8 +43,8 @@ while read comment; do
   cat <<EOF > f-kd-1-$n.in
 xi18n(${string});
 EOF
-  ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format --flag=i18n:1:kde-format -kxi18n -ki18n -o f-kd-1-$n.po f-kd-1-$n.in || exit 1
-  test -f f-kd-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --kde --flag=xi18n:1:kde-kuit-format --flag=i18n:1:kde-format -kxi18n -ki18n -o f-kd-1-$n.po f-kd-1-$n.in || Exit 1
+  test -f f-kd-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep kde-kuit-format f-kd-1-$n.po > /dev/null; then
@@ -64,9 +64,9 @@ EOF
     cat f-kd-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-kd-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-1-$n.in f-kd-1-$n.po
 done < f-kd-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-kde-kuit-2 b/gettext-tools/tests/format-kde-kuit-2
index 0634b62..f4e5564 100755
--- a/gettext-tools/tests/format-kde-kuit-2
+++ b/gettext-tools/tests/format-kde-kuit-2
@@ -14,7 +14,7 @@ EOF
 LC_ALL=C ${MSGFMT} --check-format -o /dev/null f-kd-invalid.po 2>&1 | grep 'not a valid KDE KUIT format' > /dev/null 2>&1
 test $? = 0 || {
   echo "Skipping test: msgfmt was built without KDE KUIT format support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > f-kd-2.data
@@ -72,9 +72,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-kd-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-kd-2-$n.po f-kd-2-$n.mo
 done < f-kd-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-librep-1 b/gettext-tools/tests/format-librep-1
index 2168381..cffaa89 100755
--- a/gettext-tools/tests/format-librep-1
+++ b/gettext-tools/tests/format-librep-1
@@ -76,8 +76,8 @@ while read comment; do
   cat <<EOF > f-lr-1-$n.in
 (_ ${string});
 EOF
-  ${XGETTEXT} -L librep -o f-lr-1-$n.po f-lr-1-$n.in || exit 1
-  test -f f-lr-1-$n.po || exit 1
+  ${XGETTEXT} -L librep -o f-lr-1-$n.po f-lr-1-$n.in || Exit 1
+  test -f f-lr-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep librep-format f-lr-1-$n.po > /dev/null; then
@@ -97,9 +97,9 @@ EOF
     cat f-lr-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-lr-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lr-1-$n.in f-lr-1-$n.po
 done < f-lr-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-librep-2 b/gettext-tools/tests/format-librep-2
index 6266619..bb3c44e 100755
--- a/gettext-tools/tests/format-librep-2
+++ b/gettext-tools/tests/format-librep-2
@@ -137,9 +137,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-lr-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lr-2-$n.po f-lr-2-$n.mo
 done < f-lr-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lisp-1 b/gettext-tools/tests/format-lisp-1
index ef863b3..2781376 100755
--- a/gettext-tools/tests/format-lisp-1
+++ b/gettext-tools/tests/format-lisp-1
@@ -258,8 +258,8 @@ while read comment; do
   cat <<EOF > f-l-1-$n.in
 (gettext ${string})
 EOF
-  ${XGETTEXT} -L Lisp -o f-l-1-$n.po f-l-1-$n.in || exit 1
-  test -f f-l-1-$n.po || exit 1
+  ${XGETTEXT} -L Lisp -o f-l-1-$n.po f-l-1-$n.in || Exit 1
+  test -f f-l-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep lisp-format f-l-1-$n.po > /dev/null; then
@@ -279,9 +279,9 @@ EOF
     cat f-l-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-l-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-l-1-$n.in f-l-1-$n.po
 done < f-l-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lisp-2 b/gettext-tools/tests/format-lisp-2
index 46c4fee..a3958e9 100755
--- a/gettext-tools/tests/format-lisp-2
+++ b/gettext-tools/tests/format-lisp-2
@@ -215,9 +215,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-l-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-l-2-$n.po f-l-2-$n.mo
 done < f-l-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-lua-1 b/gettext-tools/tests/format-lua-1
index 6a213d7..502342c 100755
--- a/gettext-tools/tests/format-lua-1
+++ b/gettext-tools/tests/format-lua-1
@@ -61,8 +61,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "gettext.gettext(${string});" > f-lu-1-$n.in
-  ${XGETTEXT} -L Lua -o f-lu-1-$n.po f-lu-1-$n.in || exit 1
-  test -f f-lu-1-$n.po || exit 1
+  ${XGETTEXT} -L Lua -o f-lu-1-$n.po f-lu-1-$n.in || Exit 1
+  test -f f-lu-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep lua-format f-lu-1-$n.po > /dev/null; then
@@ -82,10 +82,10 @@ while read comment; do
     cat f-lu-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-lu-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lu-1-$n.in f-lu-1-$n.po
 done < f-lu-1.data
 
-exit 0
+Exit 0
 
diff --git a/gettext-tools/tests/format-lua-2 b/gettext-tools/tests/format-lua-2
index 5c4a45b..8b7308e 100755
--- a/gettext-tools/tests/format-lua-2
+++ b/gettext-tools/tests/format-lua-2
@@ -110,9 +110,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-lu-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-lu-2-$n.po f-lu-2-$n.mo
 done < f-lu-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-pascal-1 b/gettext-tools/tests/format-pascal-1
index 16549b1..c0694c0 100755
--- a/gettext-tools/tests/format-pascal-1
+++ b/gettext-tools/tests/format-pascal-1
@@ -94,8 +94,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "x.y=${string}" | sed -e "s/\"/'/g" > f-op-1-$n.in
-  ${XGETTEXT} -L RST -o f-op-1-$n.po f-op-1-$n.in || exit 1
-  test -f f-op-1-$n.po || exit 1
+  ${XGETTEXT} -L RST -o f-op-1-$n.po f-op-1-$n.in || Exit 1
+  test -f f-op-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep object-pascal-format f-op-1-$n.po > /dev/null; then
@@ -115,9 +115,9 @@ while read comment; do
     cat f-op-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-op-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-op-1-$n.in f-op-1-$n.po
 done < f-op-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-pascal-2 b/gettext-tools/tests/format-pascal-2
index 48bacc4..67d02f5 100755
--- a/gettext-tools/tests/format-pascal-2
+++ b/gettext-tools/tests/format-pascal-2
@@ -122,9 +122,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-op-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-op-2-$n.po f-op-2-$n.mo
 done < f-op-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1
index 3f8a44a..090795a 100755
--- a/gettext-tools/tests/format-perl-1
+++ b/gettext-tools/tests/format-perl-1
@@ -136,8 +136,8 @@ while read comment; do
   sed -e 's,\$,\\$,g' <<EOF > f-pl-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Perl -o f-pl-1-$n.po f-pl-1-$n.in || exit 1
-  test -f f-pl-1-$n.po || exit 1
+  ${XGETTEXT} -L Perl -o f-pl-1-$n.po f-pl-1-$n.in || Exit 1
+  test -f f-pl-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep perl-format f-pl-1-$n.po > /dev/null; then
@@ -157,9 +157,9 @@ EOF
     cat f-pl-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pl-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pl-1-$n.in f-pl-1-$n.po
 done < f-pl-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2
index 8bbbd2e..4a5faa4 100755
--- a/gettext-tools/tests/format-perl-2
+++ b/gettext-tools/tests/format-perl-2
@@ -233,9 +233,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pl-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pl-2-$n.po f-pl-2-$n.mo
 done < f-pl-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-brace-1 b/gettext-tools/tests/format-perl-brace-1
index c42ddaa..413b814 100755
--- a/gettext-tools/tests/format-perl-brace-1
+++ b/gettext-tools/tests/format-perl-brace-1
@@ -36,8 +36,8 @@ while read comment; do
   cat <<EOF > f-pb-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Perl -o f-pb-1-$n.po f-pb-1-$n.in || exit 1
-  test -f f-pb-1-$n.po || exit 1
+  ${XGETTEXT} -L Perl -o f-pb-1-$n.po f-pb-1-$n.in || Exit 1
+  test -f f-pb-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep perl-brace-format f-pb-1-$n.po > /dev/null; then
@@ -57,9 +57,9 @@ EOF
     cat f-pb-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pb-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pb-1-$n.in f-pb-1-$n.po
 done < f-pb-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-brace-2 b/gettext-tools/tests/format-perl-brace-2
index 486bf30..a1c207d 100755
--- a/gettext-tools/tests/format-perl-brace-2
+++ b/gettext-tools/tests/format-perl-brace-2
@@ -56,9 +56,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pb-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pb-2-$n.po f-pb-2-$n.mo
 done < f-pb-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-mixed-1 b/gettext-tools/tests/format-perl-mixed-1
index d94abf3..119fcfd 100755
--- a/gettext-tools/tests/format-perl-mixed-1
+++ b/gettext-tools/tests/format-perl-mixed-1
@@ -35,8 +35,8 @@ while read comment; do
   cat <<EOF > f-pm-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L perl --omit-header --no-location -o f-pm-1-$n.po f-pm-1-$n.in || exit 1
-  test -f f-pm-1-$n.po || exit 1
+  ${XGETTEXT} -L perl --omit-header --no-location -o f-pm-1-$n.po f-pm-1-$n.in || Exit 1
+  test -f f-pm-1-$n.po || Exit 1
   fail=
   if test -n "${formats}"; then
     # Verify that the first line contains the expected #, comment.
@@ -58,8 +58,8 @@ EOF
     cat f-pm-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pm-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
 done < f-pm-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-perl-mixed-2 b/gettext-tools/tests/format-perl-mixed-2
index 6e313f7..738eb1e 100755
--- a/gettext-tools/tests/format-perl-mixed-2
+++ b/gettext-tools/tests/format-perl-mixed-2
@@ -65,8 +65,8 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pm-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
 done < f-pm-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-php-1 b/gettext-tools/tests/format-php-1
index 642e660..79583d2 100755
--- a/gettext-tools/tests/format-php-1
+++ b/gettext-tools/tests/format-php-1
@@ -82,8 +82,8 @@ while read comment; do
   read string
   n=`expr $n + 1`
   echo "<?= gettext(${string}) ?>" | sed -e 's/\$/\\\$/g' > f-ph-1-$n.in
-  ${XGETTEXT} -L PHP -o f-ph-1-$n.po f-ph-1-$n.in || exit 1
-  test -f f-ph-1-$n.po || exit 1
+  ${XGETTEXT} -L PHP -o f-ph-1-$n.po f-ph-1-$n.in || Exit 1
+  test -f f-ph-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep php-format f-ph-1-$n.po > /dev/null; then
@@ -103,9 +103,9 @@ while read comment; do
     cat f-ph-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-ph-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-ph-1-$n.in f-ph-1-$n.po
 done < f-ph-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-php-2 b/gettext-tools/tests/format-php-2
index f64c119..dc6fbc2 100755
--- a/gettext-tools/tests/format-php-2
+++ b/gettext-tools/tests/format-php-2
@@ -110,9 +110,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-ph-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-ph-2-$n.po f-ph-2-$n.mo
 done < f-ph-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-1 b/gettext-tools/tests/format-python-1
index b42ccca..1bbc982 100755
--- a/gettext-tools/tests/format-python-1
+++ b/gettext-tools/tests/format-python-1
@@ -104,8 +104,8 @@ gettext(${string});
 EOF
   # Hide xgettext's "The translator cannot reorder the arguments." warnings.
   ${XGETTEXT} -L Python -o f-p-1-$n.po f-p-1-$n.in 2> f-p-1.err \
-    || { cat f-p-1.err 1>&2; exit 1; }
-  test -f f-p-1-$n.po || exit 1
+    || { cat f-p-1.err 1>&2; Exit 1; }
+  test -f f-p-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep python-format f-p-1-$n.po > /dev/null; then
@@ -125,9 +125,9 @@ EOF
     cat f-p-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-p-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-p-1-$n.in f-p-1-$n.po
 done < f-p-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-2 b/gettext-tools/tests/format-python-2
index 204fc0c..455aba1 100755
--- a/gettext-tools/tests/format-python-2
+++ b/gettext-tools/tests/format-python-2
@@ -137,9 +137,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-p-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-p-2-$n.po f-p-2-$n.mo
 done < f-p-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-brace-1 b/gettext-tools/tests/format-python-brace-1
index 3a1f9ea..593e3a6 100755
--- a/gettext-tools/tests/format-python-brace-1
+++ b/gettext-tools/tests/format-python-brace-1
@@ -54,8 +54,8 @@ while read comment; do
   cat <<EOF > f-pyb-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L Python -o f-pyb-1-$n.po f-pyb-1-$n.in || exit 1
-  test -f f-pyb-1-$n.po || exit 1
+  ${XGETTEXT} -L Python -o f-pyb-1-$n.po f-pyb-1-$n.in || Exit 1
+  test -f f-pyb-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep python-brace-format f-pyb-1-$n.po > /dev/null; then
@@ -75,9 +75,9 @@ EOF
     cat f-pyb-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-pyb-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pyb-1-$n.in f-pyb-1-$n.po
 done < f-pyb-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-python-brace-2 b/gettext-tools/tests/format-python-brace-2
index 3f9423f..376ad26 100755
--- a/gettext-tools/tests/format-python-brace-2
+++ b/gettext-tools/tests/format-python-brace-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-pyb-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-pyb-2-$n.po f-pyb-2-$n.mo
 done < f-pyb-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-1 b/gettext-tools/tests/format-qt-1
index a092ef7..74e27ef 100755
--- a/gettext-tools/tests/format-qt-1
+++ b/gettext-tools/tests/format-qt-1
@@ -42,8 +42,8 @@ while read comment; do
   cat <<EOF > f-qt-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --qt -k_ -o f-qt-1-$n.po f-qt-1-$n.in || exit 1
-  test -f f-qt-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --qt -k_ -o f-qt-1-$n.po f-qt-1-$n.in || Exit 1
+  test -f f-qt-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep qt-format f-qt-1-$n.po > /dev/null; then
@@ -63,9 +63,9 @@ EOF
     cat f-qt-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-qt-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qt-1-$n.in f-qt-1-$n.po
 done < f-qt-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-2 b/gettext-tools/tests/format-qt-2
index 4cfc713..602c377 100755
--- a/gettext-tools/tests/format-qt-2
+++ b/gettext-tools/tests/format-qt-2
@@ -74,9 +74,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-qt-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qt-2-$n.po f-qt-2-$n.mo
 done < f-qt-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-plural-1 b/gettext-tools/tests/format-qt-plural-1
index 89bbfc3..7b44251 100755
--- a/gettext-tools/tests/format-qt-plural-1
+++ b/gettext-tools/tests/format-qt-plural-1
@@ -30,8 +30,8 @@ while read comment; do
   cat <<EOF > f-qtp-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L C++ --qt -k_ -o f-qtp-1-$n.po f-qtp-1-$n.in || exit 1
-  test -f f-qtp-1-$n.po || exit 1
+  ${XGETTEXT} -L C++ --qt -k_ -o f-qtp-1-$n.po f-qtp-1-$n.in || Exit 1
+  test -f f-qtp-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep qt-plural-format f-qtp-1-$n.po > /dev/null; then
@@ -51,9 +51,9 @@ EOF
     cat f-qtp-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-qtp-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qtp-1-$n.in f-qtp-1-$n.po
 done < f-qtp-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-qt-plural-2 b/gettext-tools/tests/format-qt-plural-2
index ec21a86..8cb6e6a 100755
--- a/gettext-tools/tests/format-qt-plural-2
+++ b/gettext-tools/tests/format-qt-plural-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-qtp-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-qtp-2-$n.po f-qtp-2-$n.mo
 done < f-qtp-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-scheme-1 b/gettext-tools/tests/format-scheme-1
index 6a34146..8450d02 100755
--- a/gettext-tools/tests/format-scheme-1
+++ b/gettext-tools/tests/format-scheme-1
@@ -260,8 +260,8 @@ while read comment; do
   cat <<EOF > f-sc-1-$n.in
 (gettext ${string})
 EOF
-  ${XGETTEXT} -L Scheme -o f-sc-1-$n.po f-sc-1-$n.in || exit 1
-  test -f f-sc-1-$n.po || exit 1
+  ${XGETTEXT} -L Scheme -o f-sc-1-$n.po f-sc-1-$n.in || Exit 1
+  test -f f-sc-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep scheme-format f-sc-1-$n.po > /dev/null; then
@@ -281,9 +281,9 @@ EOF
     cat f-sc-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-sc-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sc-1-$n.in f-sc-1-$n.po
 done < f-sc-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-scheme-2 b/gettext-tools/tests/format-scheme-2
index 44829ae..417a382 100755
--- a/gettext-tools/tests/format-scheme-2
+++ b/gettext-tools/tests/format-scheme-2
@@ -230,9 +230,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-sc-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sc-2-$n.po f-sc-2-$n.mo
 done < f-sc-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-sh-1 b/gettext-tools/tests/format-sh-1
index e274a7b..28c7623 100755
--- a/gettext-tools/tests/format-sh-1
+++ b/gettext-tools/tests/format-sh-1
@@ -40,8 +40,8 @@ while read comment; do
   LC_ALL=C sed -e 's,\$,\\$,g' <<EOF > f-sh-1-$n.in
 gettext ${string};
 EOF
-  ${XGETTEXT} -L Shell --from-code=ISO-8859-1 -o f-sh-1-$n.po f-sh-1-$n.in || exit 1
-  test -f f-sh-1-$n.po || exit 1
+  ${XGETTEXT} -L Shell --from-code=ISO-8859-1 -o f-sh-1-$n.po f-sh-1-$n.in || Exit 1
+  test -f f-sh-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep sh-format f-sh-1-$n.po > /dev/null; then
@@ -61,9 +61,9 @@ EOF
     cat f-sh-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-sh-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sh-1-$n.in f-sh-1-$n.po
 done < f-sh-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-sh-2 b/gettext-tools/tests/format-sh-2
index d98005a..5a19214 100755
--- a/gettext-tools/tests/format-sh-2
+++ b/gettext-tools/tests/format-sh-2
@@ -53,9 +53,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-sh-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-sh-2-$n.po f-sh-2-$n.mo
 done < f-sh-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-tcl-1 b/gettext-tools/tests/format-tcl-1
index feecaaa..984f0c7 100755
--- a/gettext-tools/tests/format-tcl-1
+++ b/gettext-tools/tests/format-tcl-1
@@ -108,8 +108,8 @@ while read comment; do
   cat <<EOF > f-t-1-$n.in
 [msgcat::mc ${string}];
 EOF
-  ${XGETTEXT} -L Tcl -o f-t-1-$n.po f-t-1-$n.in || exit 1
-  test -f f-t-1-$n.po || exit 1
+  ${XGETTEXT} -L Tcl -o f-t-1-$n.po f-t-1-$n.in || Exit 1
+  test -f f-t-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep tcl-format f-t-1-$n.po > /dev/null; then
@@ -129,9 +129,9 @@ EOF
     cat f-t-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-t-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-t-1-$n.in f-t-1-$n.po
 done < f-t-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-tcl-2 b/gettext-tools/tests/format-tcl-2
index 8a94236..7a9b9f9 100755
--- a/gettext-tools/tests/format-tcl-2
+++ b/gettext-tools/tests/format-tcl-2
@@ -131,9 +131,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-t-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-t-2-$n.po f-t-2-$n.mo
 done < f-t-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-ycp-1 b/gettext-tools/tests/format-ycp-1
index c010209..bf7b3a9 100755
--- a/gettext-tools/tests/format-ycp-1
+++ b/gettext-tools/tests/format-ycp-1
@@ -30,8 +30,8 @@ while read comment; do
   cat <<EOF > f-y-1-$n.in
 _(${string});
 EOF
-  ${XGETTEXT} -L YCP -o f-y-1-$n.po f-y-1-$n.in || exit 1
-  test -f f-y-1-$n.po || exit 1
+  ${XGETTEXT} -L YCP -o f-y-1-$n.po f-y-1-$n.in || Exit 1
+  test -f f-y-1-$n.po || Exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
     if grep ycp-format f-y-1-$n.po > /dev/null; then
@@ -51,9 +51,9 @@ EOF
     cat f-y-1-$n.in 1>&2
     echo "Got:" 1>&2
     cat f-y-1-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-y-1-$n.in f-y-1-$n.po
 done < f-y-1.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/format-ycp-2 b/gettext-tools/tests/format-ycp-2
index e606744..b9bc466 100755
--- a/gettext-tools/tests/format-ycp-2
+++ b/gettext-tools/tests/format-ycp-2
@@ -59,9 +59,9 @@ EOF
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
     cat f-y-2-$n.po 1>&2
-    exit 1
+    Exit 1
   fi
   rm -f f-y-2-$n.po f-y-2-$n.mo
 done < f-y-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index 76c28a9..0f64ee8 100755
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -8,7 +8,7 @@
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
@@ -18,7 +18,7 @@ LC_ALL=de_DE ../testlocale || {
   else
     echo "Skipping test: locale de_DE not supported"
   fi
-  exit 77
+  Exit 77
 }
 LC_ALL=fr_FR ../testlocale || {
   if test -f /usr/bin/localedef; then
@@ -26,7 +26,7 @@ LC_ALL=fr_FR ../testlocale || {
   else
     echo "Skipping test: locale fr_FR not supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-3 || mkdir gt-3
@@ -48,9 +48,9 @@ String1 - First string for testing.
 String2 - Another string for testing.
 EOF
 
-../gettext-3-prg > gt-3.out || exit 1
+../gettext-3-prg > gt-3.out || Exit 1
 
 : ${DIFF=diff}
-${DIFF} gt-3.ok gt-3.out || exit 1
+${DIFF} gt-3.ok gt-3.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4
index fdfa096..ba200ca 100755
--- a/gettext-tools/tests/gettext-4
+++ b/gettext-tools/tests/gettext-4
@@ -16,7 +16,7 @@
   else
     echo "Skipping test: no traditional french locale is supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-4 || mkdir gt-4
@@ -26,6 +26,6 @@ test -d gt-4/fr/LC_MESSAGES || mkdir gt-4/fr/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o gt-4/fr/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-4.po
 
-../gettext-4-prg $LOCALE_FR || exit 1
+../gettext-4-prg $LOCALE_FR || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index a7af65e..d33ebf1 100755
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -8,7 +8,7 @@
 : ${GLIBC2=no}
 test "$GLIBC2" = yes || {
   echo "Skipping test: not a glibc system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
@@ -19,7 +19,7 @@ LC_ALL=de_DE.ISO-8859-1 ../testlocale || {
   else
     echo "Skipping test: locale de_DE.ISO-8859-1 not supported"
   fi
-  exit 77
+  Exit 77
 }
 LC_ALL=de_DE.UTF-8 ../testlocale || {
   if test -f /usr/bin/localedef; then
@@ -27,7 +27,7 @@ LC_ALL=de_DE.UTF-8 ../testlocale || {
   else
     echo "Skipping test: locale de_DE.UTF-8 not supported"
   fi
-  exit 77
+  Exit 77
 }
 
 test -d gt-5 || mkdir gt-5
@@ -37,6 +37,6 @@ test -d gt-5/de_DE/LC_MESSAGES || mkdir gt-5/de_DE/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o gt-5/de_DE/LC_MESSAGES/codeset.mo "$abs_srcdir"/gettext-5.po
 
-../gettext-5-prg || exit 1
+../gettext-5-prg || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index 7bc4e01..cadfbc8 100755
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -15,7 +15,7 @@
   esac
 } || {
   echo "Skipping test: not a glibc or Mac OS X system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
@@ -26,7 +26,7 @@ if test -n "$missing_locale"; then
   else
     echo "Skipping test: locale ${missing_locale} not supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 test -d gt-6 || mkdir gt-6
@@ -51,11 +51,11 @@ case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    Exit 77
     ;;
 esac
 
 : ${DIFF=diff}
-${DIFF} gt-6.ok gt-6.out || exit 1
+${DIFF} gt-6.ok gt-6.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index a38e5f1..cf9f114 100755
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -15,7 +15,7 @@
   esac
 } || {
   echo "Skipping test: not a glibc or Mac OS X system"
-  exit 77
+  Exit 77
 }
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
@@ -27,7 +27,7 @@ if test -n "$missing_locale"; then
   else
     echo "Skipping test: locale ${missing_locale} not supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 test -d gt-7 || mkdir gt-7
@@ -42,11 +42,11 @@ case $? in
   0) ;;
   77)
     echo "Skipping test: not a glibc >= 2.3 or MacOS X >= 10.5 system"
-    exit 77
+    Exit 77
     ;;
   *)
-    exit 1
+    Exit 1
     ;;
 esac
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/gettextpo-1 b/gettext-tools/tests/gettextpo-1
index 2657a1b..2ad641e 100755
--- a/gettext-tools/tests/gettextpo-1
+++ b/gettext-tools/tests/gettextpo-1
@@ -2,10 +2,10 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test the libgettextpo library.
-../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || exit 1
+../gettextpo-1-prg${EXEEXT} "$abs_srcdir"/gettextpo-1.de.po > /dev/null || Exit 1
 
 : ${DIFF=diff}
-${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || exit 1
-${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po || exit 1
+${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-copied.po || Exit 1
+${DIFF} "$abs_srcdir"/gettextpo-1.de.po gtpo-1-created.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index 7c74651..a5ec2b0 100755
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -33,8 +33,8 @@ ${XGETTEXT} -o prog.tmp --omit-header --no-location prog.bash \
   >prog.err 2>&1
 result=$?
 cat prog.err | grep -v 'warning: the syntax \$"\.\.\." is deprecated due to security reasons'
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -48,7 +48,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -68,11 +68,11 @@ msgstr[1] "$n morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -82,10 +82,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of bash version 2.0 or newer.
 (bash -c :) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: bash not found"; exit 77; }
+  || { echo "Skipping test: bash not found"; Exit 77; }
 case `bash -c 'echo $BASH_VERSION'` in
   [2-9].*) ;;
-  *) echo "Skipping test: bash version too old"; exit 77;;
+  *) echo "Skipping test: bash version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -96,7 +96,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -104,7 +104,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -113,18 +113,18 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 case "$host_os" in
   darwin*)
     if test $LOCALE_FR != none; then
       LC_ALL=$LOCALE_FR bash --help \
-        | grep '^Utilisation' > /dev/null 2>&1 || exit 77
+        | grep '^Utilisation' > /dev/null 2>&1 || Exit 77
     fi
     if test $LOCALE_FR_UTF8 != none; then
       LC_ALL=$LOCALE_FR_UTF8 bash --help \
-        | grep '^Utilisation' > /dev/null 2>&1 || exit 77
+        | grep '^Utilisation' > /dev/null 2>&1 || Exit 77
     fi
   ;;
 esac
@@ -148,23 +148,23 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.bash 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
     echo "Skipping test: bash is built without i18n support"
-    exit 77
+    Exit 77
   }
-  ${DIFF} prog.ok prog.out || exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.bash 2 > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.bash 2 > prog.out || Exit 1
   : ${DIFF=diff}
   ${DIFF} prog.nok prog.out > /dev/null && {
     echo "Skipping test: bash is built without i18n support"
-    exit 77
+    Exit 77
   }
-  ${DIFF} prog.oku prog.out || exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index f58df88..2babb08 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -43,17 +43,17 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
 ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
-      ${CPPFLAGS} -c prog.c || exit 1
+      ${CPPFLAGS} -c prog.c || Exit 1
 
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
                 ${CC} ${CFLAGS} -o prog prog.${OBJEXT} \
                 ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.c || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #, c-format
@@ -72,7 +72,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -98,11 +98,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -128,18 +128,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -148,7 +148,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 65a8a28..105e70e 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -8,11 +8,11 @@
 # Test whether a C++ compiler is found and libasprintf is built.
 test "${CXX}" != "no" || {
   echo "Skipping test: no C++ compiler found"
-  exit 77
+  Exit 77
 }
 test "${TESTLIBASPRINTF}" = yes || {
   echo "Skipping test: configured with --disable-libasprintf"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > prog.cc
@@ -62,7 +62,7 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CXXFLAGS} or ${CPPFLAGS}.
 ${CXX} -I../.. -I../../../gettext-runtime/libasprintf -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CXXFLAGS} ${CPPFLAGS} -c prog.cc \
-  || exit 1
+  || Exit 1
 # Remove the -Wl,--disable-auto-import option here that is added by
 # woe32-dll.m4. Cygwin 1.7.2 does not support it in C++ mode: It gives
 # a link error about 'std::cout'.
@@ -71,11 +71,11 @@ ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CXX --mode=link \
                 ${CXX} ${CXXFLAGS} `echo "X ${LDFLAGS} " | sed -e 's/^X//' -e 's/ -Wl,--disable-auto-import / /'` -o prog prog.${OBJEXT} \
                 ../../../gettext-runtime/libasprintf/libasprintf.la \
                 ../../gnulib-lib/libgettextlib.la ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.cc || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -93,7 +93,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -118,11 +118,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -148,18 +148,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -168,7 +168,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index 631d30a..471c4f6 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -19,8 +19,8 @@ cat <<\EOF > prog.lisp
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lisp || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -38,7 +38,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -63,11 +63,11 @@ msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -79,17 +79,17 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Use clisp for the comparison of the version numbers; neither 'expr' nor 'bc'
 # can deal with floating-point numbers.
 (clisp --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: clisp not found"; exit 77; }
+  || { echo "Skipping test: clisp not found"; Exit 77; }
 version=`clisp --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
 case $version in
   19* | 20*) # older than 2.25
-    echo "Skipping test: clisp version too old"; exit 77;;
+    echo "Skipping test: clisp version too old"; Exit 77;;
 esac
 version=`echo $version | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
 clisp -norc -x "(sys::exit #+GETTEXT (not (>= $version 2.28)) #-GETTEXT t)" \
       >/dev/null \
   || { echo "Skipping test: clisp was built without gettext support"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -100,7 +100,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -108,7 +108,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -117,7 +117,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -136,15 +136,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR clisp prog.lisp 2 > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  CLISP_LANGUAGE= LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 clisp prog.lisp 2 > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 505d979..eccfe54 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -12,15 +12,15 @@
 # Test whether we can build and test C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
-  exit 77
+  Exit 77
 }
 test "${BUILDCSHARP}" = yes || {
   echo "Skipping test: C# compiler not found"
-  exit 77
+  Exit 77
 }
 test "${TESTCSHARP}" = yes || {
   echo "Skipping test: C# engine not found"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > program.cs
@@ -47,11 +47,11 @@ class Program {
 EOF
 
 : ${CSHARPCOMP="/bin/sh ../../csharpcomp.sh"}
-${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || exit 1
+${CSHARPCOMP} -o program.exe -L ../../../gettext-runtime/intl-csharp -l GNU.Gettext program.cs || Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location program.cs || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -81,7 +81,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -120,15 +120,15 @@ msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 : ${MSGFMT=msgfmt}
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGFMT} --csharp -d . -r prog -l fr fr.po || exit 1
+${MSGFMT} --csharp -d . -r prog -l fr fr.po || Exit 1
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -138,7 +138,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -146,7 +146,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -155,7 +155,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -179,13 +179,13 @@ EOF
 : ${CSHARPEXEC="/bin/sh ../../csharpexec.sh"}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ${CSHARPEXEC} -L ../../../gettext-runtime/intl-csharp program.exe 2 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-elisp b/gettext-tools/tests/lang-elisp
index 5823ff7..3081ddc 100755
--- a/gettext-tools/tests/lang-elisp
+++ b/gettext-tools/tests/lang-elisp
@@ -14,8 +14,8 @@ cat <<\EOF > prog.el
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.el || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -27,7 +27,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -45,11 +45,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -57,4 +57,4 @@ test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 : ${MSGFMT=msgfmt}
 ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index 47bcb34..33b6831 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -23,8 +23,8 @@ BEGIN {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.awk || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -42,7 +42,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -81,10 +81,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gawk version 3.1.3 or newer, excluding version 3.1.5.
 (gawk --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gawk not found"; exit 77; }
+  || { echo "Skipping test: gawk not found"; Exit 77; }
 case `gawk --version 2>&1 | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.* | 3.0* | 3.1.0* | 3.1.1* | 3.1.2* | 3.1.5*)
-    echo "Skipping test: gawk version too old"; exit 77;;
+    echo "Skipping test: gawk version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -95,7 +95,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -103,7 +103,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -112,7 +112,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 # Test that gawk wasn't built with --disable-nls.
@@ -122,14 +122,14 @@ if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR gawk --version | grep logiciel > /dev/null
   test $? = 0 || {
     echo "Skipping test: gawk was built without i18n support"
-    exit 77
+    Exit 77
   }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk --version | grep logiciel > /dev/null
   test $? = 0 || {
     echo "Skipping test: gawk was built without i18n support"
-    exit 77
+    Exit 77
   }
 fi
 
@@ -149,13 +149,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gawk -v n=2 -f prog.awk > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk -v n=2 -f prog.awk > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 4023d77..9a2a9b8 100755
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -22,8 +22,8 @@ cat <<\EOF > prog.scm
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.scm || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -41,7 +41,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -66,11 +66,11 @@ msgstr "~1@*~A remplace ~0@*~A."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -80,10 +80,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of guile version 1.7 or newer.
 (guile --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: guile not found"; exit 77; }
+  || { echo "Skipping test: guile not found"; Exit 77; }
 case `guile --version | sed -e 1q | sed -e 's/^[^0-9]*//'` in
   0.* | 1.[0-6] | 1.[0-6].* )
-    echo "Skipping test: guile version too old"; exit 77;;
+    echo "Skipping test: guile version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -94,7 +94,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -102,7 +102,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -111,7 +111,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -130,15 +130,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  LANGUAGE= LC_ALL=$LOCALE_FR guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
-  ${DIFF} prog.ok prog.out || exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; exit 1; }
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 guile -s prog.scm 2 > prog.out 2>prog.err || { cat prog.err 1>&2; Exit 1; }
   grep -v '^;;;' prog.err 1>&2
-  ${DIFF} prog.oku prog.out || exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index e09ec86..5582114 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -11,15 +11,15 @@
 # Test whether we can build and test Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
-  exit 77
+  Exit 77
 }
 test "${BUILDJAVA}" = yes || {
   echo "Skipping test: Java compiler or jar not found"
-  exit 77
+  Exit 77
 }
 test "${TESTJAVA}" = yes || {
   echo "Skipping test: Java engine not found"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > Program.java
@@ -61,11 +61,11 @@ EOF
 
 : ${JAVACOMP="/bin/sh ../../javacomp.sh"}
 CLASSPATH=../../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d . Program.java 2>prog.err \
-  || { cat prog.err 1>&2; exit 1; }
+  || { cat prog.err 1>&2; Exit 1; }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location Program.java || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -95,7 +95,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -134,14 +134,14 @@ msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d . -r prog -l fr fr.po || exit 1
+${MSGFMT} -j -d . -r prog -l fr fr.po || Exit 1
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -151,7 +151,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -159,7 +159,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -168,7 +168,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -192,13 +192,13 @@ EOF
 : ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=.:../../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-javascript b/gettext-tools/tests/lang-javascript
index 5f502aa..bbed140 100755
--- a/gettext-tools/tests/lang-javascript
+++ b/gettext-tools/tests/lang-javascript
@@ -19,8 +19,8 @@ print(_("%s is replaced by %s.").format("FF", "EUR"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.js || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.js || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -32,7 +32,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -48,11 +48,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -62,13 +62,13 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gjs.
 (gjs -h) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gjs not found"; exit 77; }
+  || { echo "Skipping test: gjs not found"; Exit 77; }
 (gjs -c imports.gettext) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gjs gettext module not found"; exit 77; }
+  || { echo "Skipping test: gjs gettext module not found"; Exit 77; }
 (gjs -c imports.format) >/dev/null 2>/dev/null \
-    || { echo "Skipping test: gjs format module not found"; exit 77; }
+    || { echo "Skipping test: gjs format module not found"; Exit 77; }
 (pkg-config gjs-1.0 --atleast-version=1.40) >/dev/null 2>/dev/null \
-    || { echo "Skipping test: gjs version is older than 1.40"; exit 77; }
+    || { echo "Skipping test: gjs version is older than 1.40"; Exit 77; }
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -78,7 +78,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -86,7 +86,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -95,7 +95,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -112,13 +112,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gjs prog.js > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gjs prog.js > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gjs prog.js > prog.out || exit 1
-  ${DIFF} -u prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gjs prog.js > prog.out || Exit 1
+  ${DIFF} -u prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index 4c7e3f2..db314a9 100755
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -18,8 +18,8 @@ cat <<\EOF > prog.jl
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.jl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -31,7 +31,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -49,11 +49,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -63,10 +63,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of rep version 0.15.3 or newer.
 (rep --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: rep not found"; exit 77; }
+  || { echo "Skipping test: rep not found"; Exit 77; }
 case `rep --version | sed -e 's/^[^0-9]*//'` in
   0.[0-9] | 0.1[0-5] | 0.[0-9].* | 0.1[0-4].* | 0.15.[0-2] )
-    echo "Skipping test: rep version too old"; exit 77;;
+    echo "Skipping test: rep version too old"; Exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -77,7 +77,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -85,7 +85,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -94,7 +94,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -111,13 +111,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR rep --no-rc --batch prog.jl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR rep --no-rc --batch prog.jl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 rep --no-rc --batch prog.jl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 rep --no-rc --batch prog.jl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-lua b/gettext-tools/tests/lang-lua
index 202ef13..c0e35df 100755
--- a/gettext-tools/tests/lang-lua
+++ b/gettext-tools/tests/lang-lua
@@ -18,8 +18,8 @@ print(string.format(_[==[%s is replaced by %s.]==], "FF", "EUR"))
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lua || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.lua || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -37,7 +37,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -60,11 +60,11 @@ msgstr "%s remplace %s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -75,14 +75,14 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Test for presence of lua version 5.0 or newer with gettext support.
 (lua -v) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: lua not found"; exit 77; }
+  || { echo "Skipping test: lua not found"; Exit 77; }
 case `lua -v 2>&1 | sed -e 's/^[^0-9]*//'` in
   [5-9].*) ;;
-  *) echo "Skipping test: lua version too old"; exit 77;;
+  *) echo "Skipping test: lua version too old"; Exit 77;;
 esac
 { lua -v -l gettext > /dev/null 2>/dev/null; } \
   || { echo "Skipping test: lua gettext module not found"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -93,7 +93,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -101,7 +101,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -110,7 +110,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -129,13 +129,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR lua -l gettext prog.lua > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR lua -l gettext prog.lua > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 lua -l gettext prog.lua > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 lua -l gettext prog.lua > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 126246f..25ca211 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -17,7 +17,7 @@ int main ()
 EOF
 ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hello hello.m 2>/dev/null \
   || { echo "Skipping test: Objective C compiler not found"
-       exit 77
+       Exit 77
      }
 
 cat <<\EOF > prog.m
@@ -58,17 +58,17 @@ EOF
 # is found in the build directory, regardless of -I options present in
 # ${CFLAGS} or ${CPPFLAGS}.
 ${CC} -I../.. -I"$abs_top_srcdir"/gnulib-lib -I../../intl ${CFLAGS} \
-      ${CPPFLAGS} -c prog.m || exit 1
+      ${CPPFLAGS} -c prog.m || Exit 1
 
 : ${CONFIG_SHELL=${SHELL-/bin/sh}}
 ${CONFIG_SHELL} "$top_builddir"/libtool --quiet --tag=CC --mode=link \
                 ${CC} ${CFLAGS} -o prog prog.${OBJEXT} \
                 ../../gnulib-lib/libgettextlib.la ${LDFLAGS} ${LTLIBINTL} \
-		|| exit 1
+		|| Exit 1
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location -k_ prog.m || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #, c-format
@@ -87,7 +87,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -113,11 +113,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -143,18 +143,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= ./prog $LOCALE_FR 2 > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= ./prog $LOCALE_FR_UTF8 2 > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -163,7 +163,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 76a12b6..a6781e8 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -30,12 +30,12 @@ EOF
 (ppcx64 pascalprog.pp) >/dev/null 2>&1 ||
 {
   echo "Skipping test: Pascal compiler ppc386 or ppcx64 not found"
-  exit 77
+  Exit 77
 }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o pascalprog.tmp --omit-header --add-location pascalprog.rst || exit 1
-LC_ALL=C tr -d '\r' < pascalprog.tmp > pascalprog.pot || exit 1
+${XGETTEXT} -o pascalprog.tmp --omit-header --add-location pascalprog.rst || Exit 1
+LC_ALL=C tr -d '\r' < pascalprog.tmp > pascalprog.pot || Exit 1
 
 cat <<EOF > pascalprog.ok
 #: pascalprog.question
@@ -49,7 +49,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} pascalprog.ok pascalprog.pot || exit 1
+${DIFF} pascalprog.ok pascalprog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "%1:s remplace %0:s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po pascalprog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po pascalprog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -93,16 +93,16 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || exit 1
+  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || Exit 1
   : ${DIFF=diff}
-  ${DIFF} pascalprog.ok pascalprog.out || exit 1
+  ${DIFF} pascalprog.ok pascalprog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || exit 1
+    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || Exit 1
     : ${DIFF=diff}
-    ${DIFF} pascalprog.oku pascalprog.out || exit 1
+    ${DIFF} pascalprog.oku pascalprog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -110,7 +110,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -119,8 +119,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index acf6c97..40b1424 100755
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -24,8 +24,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} \
   -k__ --flag=__:1:pass-perl-format --flag=__:1:pass-perl-brace-format \
-  -o prog.tmp --omit-header --no-location program1.pl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+  -o prog.tmp --omit-header --no-location program1.pl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -43,7 +43,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -68,11 +68,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -95,20 +95,20 @@ EOF
 # Test for perl with Locale::Messages package.
 perl -e 'use Locale::Messages;' 2>/dev/null \
   || { echo "Skipping test: perl package Locale::Messages is not installed"
-       exit 77
+       Exit 77
      }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program1.pl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -116,7 +116,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index 40b814b..5bc2fa8 100755
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -23,8 +23,8 @@ ${XGETTEXT} \
   -k__n:1,2 --flag=__n:1:pass-perl-format --flag=__n:1:pass-perl-brace-format \
             --flag=__n:2:pass-perl-format --flag=__n:2:pass-perl-brace-format \
   -k__x --flag=__x:1:perl-brace-format \
-  -o prog.tmp --omit-header --no-location program2.pl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+  -o prog.tmp --omit-header --no-location program2.pl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -42,7 +42,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -67,11 +67,11 @@ msgstr "{new} remplace {old}."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d l-perl-2 || mkdir l-perl-2
 test -d fr || mkdir fr
@@ -95,20 +95,20 @@ EOF
 # Test for perl with libintl-perl package.
 perl -M'Locale::TextDomain' -e '' 2>/dev/null \
   || { echo "Skipping test: perl package libintl-perl is not installed"
-       exit 77
+       Exit 77
      }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= perl program2.pl > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -116,7 +116,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 83a61ab..b8238d5 100755
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -18,8 +18,8 @@ cat <<\EOF > prog.php
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.php || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -31,7 +31,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -47,11 +47,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -62,14 +62,14 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Test for presence of php version 4.0 or newer with gettext support.
 (php -v) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: php not found"; exit 77; }
+  || { echo "Skipping test: php not found"; Exit 77; }
 case `php -v | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
   [4-9].*) ;;
-  *) echo "Skipping test: php version too old"; exit 77;;
+  *) echo "Skipping test: php version too old"; Exit 77;;
 esac
 { php -m | grep '^gettext$' >/dev/null; } \
   || { echo "Skipping test: php was built without gettext support"
-       exit 77
+       Exit 77
      }
 
 # Test which of the fr_FR locales are installed.
@@ -80,7 +80,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -88,7 +88,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -97,7 +97,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -114,13 +114,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR php -q prog.php > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR php -q prog.php > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 php -q prog.php > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 php -q prog.php > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-po b/gettext-tools/tests/lang-po
index c04a343..c8b90c3 100755
--- a/gettext-tools/tests/lang-po
+++ b/gettext-tools/tests/lang-po
@@ -21,11 +21,11 @@ msgstr ""
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog-in.pot || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 : ${DIFF=diff}
-${DIFF} prog-in.pot prog.pot || exit 1
+${DIFF} prog-in.pot prog.pot || Exit 1
 
 # Test with PO format.
 
@@ -52,10 +52,10 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po || exit 1
+${XGETTEXT} -o prog.tmp.po --omit-header --add-location prog-in.po || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp.po > prog.po || Exit 1
 
 : ${DIFF=diff}
-${DIFF} prog-in.po prog.po || exit 1
+${DIFF} prog-in.po prog.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index f198780..5d482fb 100755
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -19,8 +19,8 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog1.py || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog1.py || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -32,7 +32,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -50,11 +50,11 @@ msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -64,10 +64,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of python version 2.0 or newer.
 (python -V) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: python not found"; exit 77; }
+  || { echo "Skipping test: python not found"; Exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20000F0'` in
   1 | True) ;;
-  *) echo "Skipping test: python version too old"; exit 77;;
+  *) echo "Skipping test: python version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -84,14 +84,14 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR python prog1.py > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog1.py > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog1.py > prog.out || exit 1
-    ${DIFF} prog.oku prog.out || exit 1
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog1.py > prog.out || Exit 1
+    ${DIFF} prog.oku prog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -99,7 +99,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -108,8 +108,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index 2f431c7..99e72e8 100755
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -25,8 +25,8 @@ print gettext.gettext("%(oldCurrency)s is replaced by %(newCurrency)s.") \
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog2.py || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog2.py || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -44,7 +44,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -69,11 +69,11 @@ msgstr "%(newCurrency)s remplace %(oldCurrency)s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -83,10 +83,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of python version 2.3 or newer.
 (python -V) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: python not found"; exit 77; }
+  || { echo "Skipping test: python not found"; Exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20300F0'` in
   1 | True) ;;
-  *) echo "Skipping test: python version too old"; exit 77;;
+  *) echo "Skipping test: python version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -105,14 +105,14 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR python prog2.py 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR python prog2.py 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
   if test $LOCALE_FR_UTF8 != none; then
     prepare_locale_ fr $LOCALE_FR_UTF8
-    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog2.py 2 > prog.out || exit 1
-    ${DIFF} prog.oku prog.out || exit 1
+    LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 python prog2.py 2 > prog.out || Exit 1
+    ${DIFF} prog.oku prog.out || Exit 1
   fi
   if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
     if test -f /usr/bin/localedef; then
@@ -120,7 +120,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -129,8 +129,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    exit 77
+    Exit 77
   fi
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-rst b/gettext-tools/tests/lang-rst
index 6758564..348aa72 100755
--- a/gettext-tools/tests/lang-rst
+++ b/gettext-tools/tests/lang-rst
@@ -20,8 +20,8 @@ rstconv.InvalidOutputFormat='Invalid output format -'
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --add-location prog.rst || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #: rstconv.help
@@ -54,7 +54,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 # The output of rstconv is slightly different:
 # - ModuleName:ConstName instead of ModuleName.ConstName
@@ -119,8 +119,8 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || exit 1
+${DIFF} prog.ok1 prog.pot >/dev/null || ${DIFF} prog.ok2 prog.pot || Exit 1
 
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index af417e6..2737f3a 100755
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -26,8 +26,8 @@ $echo "`eval_ngettext \"a piece of cake\" \"\\$n pieces of cake\" $n`"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.sh || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<\EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -41,7 +41,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -61,11 +61,11 @@ msgstr[1] "$n morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -81,7 +81,7 @@ if test $LOCALE_FR != none; then
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
@@ -89,7 +89,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -98,7 +98,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 : ${DIFF=diff}
@@ -115,13 +115,13 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR sh ./prog.sh 2 > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR sh ./prog.sh 2 > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 sh ./prog.sh 2 > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 sh ./prog.sh 2 > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index e21591e..6b3584d 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -31,8 +31,8 @@ Main new run!
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.st || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -50,7 +50,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -75,11 +75,11 @@ msgstr "%2 remplace %1."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -89,10 +89,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gst version 2.0.6 or newer.
 (gst --version) >/dev/null 2>/dev/null \
-  || { echo "Skipping test: gst not found"; exit 77; }
+  || { echo "Skipping test: gst not found"; Exit 77; }
 case `gst --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.0 | 2.0.[0-5] | 2.1 | 2.1.[0-1])
-    echo "Skipping test: gst version too old"; exit 77;;
+    echo "Skipping test: gst version too old"; Exit 77;;
 esac
 
 : ${DIFF=diff}
@@ -118,19 +118,19 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.ok prog.out > /dev/null ||
     ${DIFF} prog.ok2 prog.out > /dev/null ||
       ${DIFF} prog.ok3 prog.out > /dev/null ||
-        { ${DIFF} prog.ok prog.out; exit 1; }
+        { ${DIFF} prog.ok prog.out; Exit 1; }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || exit 1
+  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gst -Q prog.st > prog.out || Exit 1
   ${DIFF} prog.oku prog.out > /dev/null ||
     ${DIFF} prog.oku2 prog.out > /dev/null ||
       ${DIFF} prog.oku3 prog.out > /dev/null ||
-        { ${DIFF} prog.oku prog.out; exit 1; }
+        { ${DIFF} prog.oku prog.out; Exit 1; }
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -138,7 +138,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index e0130cc..1d75788 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -22,8 +22,8 @@ puts [format [::msgcat::mc "%s is replaced by %s."] "FF" "EUR"]
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header -k_ program.tcl || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 #: program.tcl:5
@@ -37,7 +37,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -55,16 +55,16 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d msgs || mkdir msgs
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --tcl -d msgs -l fr fr.po || exit 1
+${MSGFMT} --tcl -d msgs -l fr fr.po || Exit 1
 
 # Test for presence of tclsh with msgcat extension.
 cat <<\EOF > version.tcl
@@ -73,7 +73,7 @@ puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
   || { echo "Skipping test: tclsh not found or msgcat extension not present"
-       exit 77
+       Exit 77
      }
 
 : ${DIFF=diff}
@@ -90,15 +90,15 @@ EOF
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
-  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.ok prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.ok prog.out || Exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
-  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || exit 1
-  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || exit 1
-  ${DIFF} prog.oku prog.out || exit 1
+  LANGUAGE= LANG=$LOCALE_FR_UTF8 LC_MESSAGES= LC_CTYPE= LC_ALL= tclsh program.tcl > prog.tmp || Exit 1
+  LC_ALL=C tr -d '\r' < prog.tmp > prog.out || Exit 1
+  ${DIFF} prog.oku prog.out || Exit 1
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   if test -f /usr/bin/localedef; then
@@ -106,7 +106,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-vala b/gettext-tools/tests/lang-vala
index 3d27631..b24de6a 100755
--- a/gettext-tools/tests/lang-vala
+++ b/gettext-tools/tests/lang-vala
@@ -19,15 +19,15 @@ EOF
 # Test for presence of valac.
 (valac --version) >/dev/null 2>/dev/null
 test $? -le 1 \
-  || { echo "Skipping test: valac not found"; exit 77; }
+  || { echo "Skipping test: valac not found"; Exit 77; }
 
 : ${VALAC=valac}
 ${VALAC} --Xcc=-DGETTEXT_PACKAGE=\"prog\" prog.vala 2>prog.err \
-  || { cat prog.err 1>&2; exit 1; }
+  || { cat prog.err 1>&2; Exit 1; }
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.vala || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -39,7 +39,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -55,11 +55,11 @@ msgstr "%2$s remplace %1$s."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
 test -d fr || mkdir fr
 test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
@@ -83,18 +83,18 @@ if test $LOCALE_FR != none; then
   prepare_locale_ fr $LOCALE_FR
   LANGUAGE= LC_ALL=$LOCALE_FR ./prog > prog.out
   case $? in
-    0) ${DIFF} prog.ok prog.out || exit 1;;
+    0) ${DIFF} prog.ok prog.out || Exit 1;;
     77) LOCALE_FR=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
   prepare_locale_ fr $LOCALE_FR_UTF8
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 ./prog > prog.out
   case $? in
-    0) ${DIFF} prog.oku prog.out || exit 1;;
+    0) ${DIFF} prog.oku prog.out || Exit 1;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
@@ -103,7 +103,7 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/lang-ycp b/gettext-tools/tests/lang-ycp
index 941d8c2..20ac133 100755
--- a/gettext-tools/tests/lang-ycp
+++ b/gettext-tools/tests/lang-ycp
@@ -14,8 +14,8 @@ cat <<\EOF > prog.ycp
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp || exit 1
-LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || exit 1
+${XGETTEXT} -o prog.tmp --omit-header --no-location prog.ycp || Exit 1
+LC_ALL=C tr -d '\r' < prog.tmp > prog.pot || Exit 1
 
 cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
@@ -33,7 +33,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} prog.ok prog.pot || exit 1
+${DIFF} prog.ok prog.pot || Exit 1
 
 cat <<\EOF > fr.po
 msgid ""
@@ -58,10 +58,10 @@ msgstr "%2 remplace %1."
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || exit 1
-LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || exit 1
+${MSGMERGE} -q -o fr.po.tmp fr.po prog.pot || Exit 1
+LC_ALL=C tr -d '\r' < fr.po.tmp > fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} fr.po fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgattrib-1 b/gettext-tools/tests/msgattrib-1
index 72aa4f4..1e483ca 100755
--- a/gettext-tools/tests/msgattrib-1
+++ b/gettext-tools/tests/msgattrib-1
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out || exit 1
+${MSGATTRIB} --translated -o ma-test1.tmp ma-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test1.tmp > ma-test1.out || Exit 1
 
 cat <<\EOF > ma-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-10 b/gettext-tools/tests/msgattrib-10
index ba529db..8b30d2a 100755
--- a/gettext-tools/tests/msgattrib-10
+++ b/gettext-tools/tests/msgattrib-10
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out || exit 1
+${MSGATTRIB} --set-obsolete -o ma-test10.tmp ma-test10.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test10.tmp > ma-test10.out || Exit 1
 
 cat <<\EOF > ma-test10.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-11 b/gettext-tools/tests/msgattrib-11
index d036296..86fdc78 100755
--- a/gettext-tools/tests/msgattrib-11
+++ b/gettext-tools/tests/msgattrib-11
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out || exit 1
+${MSGATTRIB} --clear-obsolete -o ma-test11.tmp ma-test11.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test11.tmp > ma-test11.out || Exit 1
 
 cat <<\EOF > ma-test11.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-12 b/gettext-tools/tests/msgattrib-12
index 9587f1d..a05a8c4 100755
--- a/gettext-tools/tests/msgattrib-12
+++ b/gettext-tools/tests/msgattrib-12
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out || exit 1
+${MSGATTRIB} --fuzzy -o ma-test12.tmp ma-test12.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test12.tmp > ma-test12.out || Exit 1
 
 cat <<\EOF > ma-test12.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-13 b/gettext-tools/tests/msgattrib-13
index f352983..ec1a71b 100755
--- a/gettext-tools/tests/msgattrib-13
+++ b/gettext-tools/tests/msgattrib-13
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out || exit 1
+${MSGATTRIB} --obsolete -o ma-test13.tmp ma-test13.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test13.tmp > ma-test13.out || Exit 1
 
 cat <<\EOF > ma-test13.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-14 b/gettext-tools/tests/msgattrib-14
index 7c811c6..08069de 100755
--- a/gettext-tools/tests/msgattrib-14
+++ b/gettext-tools/tests/msgattrib-14
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out || exit 1
+${MSGATTRIB} --obsolete --no-fuzzy -o ma-test14.tmp ma-test14.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test14.tmp > ma-test14.out || Exit 1
 
 cat <<\EOF > ma-test14.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-15 b/gettext-tools/tests/msgattrib-15
index d32e534..fc058b5 100755
--- a/gettext-tools/tests/msgattrib-15
+++ b/gettext-tools/tests/msgattrib-15
@@ -49,8 +49,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out || exit 1
+${MSGATTRIB} --clear-fuzzy -o ma-test15.tmp ma-test15.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test15.tmp > ma-test15.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} ma-test15.po ma-test15.out
diff --git a/gettext-tools/tests/msgattrib-16 b/gettext-tools/tests/msgattrib-16
index 72fefd1..b1df38d 100755
--- a/gettext-tools/tests/msgattrib-16
+++ b/gettext-tools/tests/msgattrib-16
@@ -42,8 +42,8 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out || exit 1
+${MSGATTRIB} --fuzzy -o ma-test16.tmp ma-test16.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test16.tmp > ma-test16.out || Exit 1
 
 cat <<\EOF > ma-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgattrib-17 b/gettext-tools/tests/msgattrib-17
index fcfe915..e5ba429 100755
--- a/gettext-tools/tests/msgattrib-17
+++ b/gettext-tools/tests/msgattrib-17
@@ -42,8 +42,8 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out || exit 1
+${MSGATTRIB} --clear-previous -o ma-test17.tmp ma-test17.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test17.tmp > ma-test17.out || Exit 1
 
 cat <<\EOF > ma-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgattrib-18 b/gettext-tools/tests/msgattrib-18
index 68be0f2..0c04f6f 100755
--- a/gettext-tools/tests/msgattrib-18
+++ b/gettext-tools/tests/msgattrib-18
@@ -55,8 +55,8 @@ EOF
 
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --translated --add-location=file -o ma-test18.tmp ma-test18.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < ma-test18.tmp > ma-test18.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < ma-test18.tmp > ma-test18.out || Exit 1
 
 cat <<\EOF > ma-test18.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-19 b/gettext-tools/tests/msgattrib-19
index f517a27..3519b7a 100755
--- a/gettext-tools/tests/msgattrib-19
+++ b/gettext-tools/tests/msgattrib-19
@@ -42,8 +42,8 @@ EOF
 
 : ${MSGATTRIB=msgattrib}
 ${MSGATTRIB} --clear-fuzzy --empty -o ma-test19.tmp ma-test19.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < ma-test19.tmp > ma-test19.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < ma-test19.tmp > ma-test19.out || Exit 1
 
 cat <<\EOF > ma-test19.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-2 b/gettext-tools/tests/msgattrib-2
index 0ee4f5a..c72e783 100755
--- a/gettext-tools/tests/msgattrib-2
+++ b/gettext-tools/tests/msgattrib-2
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out || exit 1
+${MSGATTRIB} --untranslated -o ma-test2.tmp ma-test2.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test2.tmp > ma-test2.out || Exit 1
 
 cat <<\EOF > ma-test2.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-3 b/gettext-tools/tests/msgattrib-3
index 784da59..9636349 100755
--- a/gettext-tools/tests/msgattrib-3
+++ b/gettext-tools/tests/msgattrib-3
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out || exit 1
+${MSGATTRIB} --no-fuzzy -o ma-test3.tmp ma-test3.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test3.tmp > ma-test3.out || Exit 1
 
 cat <<\EOF > ma-test3.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-4 b/gettext-tools/tests/msgattrib-4
index 913d148..1270777 100755
--- a/gettext-tools/tests/msgattrib-4
+++ b/gettext-tools/tests/msgattrib-4
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out || exit 1
+${MSGATTRIB} --only-fuzzy -o ma-test4.tmp ma-test4.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test4.tmp > ma-test4.out || Exit 1
 
 cat <<\EOF > ma-test4.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-5 b/gettext-tools/tests/msgattrib-5
index 56ef8ff..72d9de1 100755
--- a/gettext-tools/tests/msgattrib-5
+++ b/gettext-tools/tests/msgattrib-5
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out || exit 1
+${MSGATTRIB} --no-obsolete -o ma-test5.tmp ma-test5.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test5.tmp > ma-test5.out || Exit 1
 
 cat <<\EOF > ma-test5.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-6 b/gettext-tools/tests/msgattrib-6
index 5a9965d..4946045 100755
--- a/gettext-tools/tests/msgattrib-6
+++ b/gettext-tools/tests/msgattrib-6
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out || exit 1
+${MSGATTRIB} --only-obsolete -o ma-test6.tmp ma-test6.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test6.tmp > ma-test6.out || Exit 1
 
 cat <<\EOF > ma-test6.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-7 b/gettext-tools/tests/msgattrib-7
index 0584c9e..40db1c9 100755
--- a/gettext-tools/tests/msgattrib-7
+++ b/gettext-tools/tests/msgattrib-7
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out || exit 1
+${MSGATTRIB} --translated --only-obsolete -o ma-test7.tmp ma-test7.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test7.tmp > ma-test7.out || Exit 1
 
 cat <<\EOF > ma-test7.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-8 b/gettext-tools/tests/msgattrib-8
index c187dd6..9a7f13f 100755
--- a/gettext-tools/tests/msgattrib-8
+++ b/gettext-tools/tests/msgattrib-8
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out || exit 1
+${MSGATTRIB} --set-fuzzy -o ma-test8.tmp ma-test8.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test8.tmp > ma-test8.out || Exit 1
 
 cat <<\EOF > ma-test8.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-9 b/gettext-tools/tests/msgattrib-9
index 8269652..e1b3368 100755
--- a/gettext-tools/tests/msgattrib-9
+++ b/gettext-tools/tests/msgattrib-9
@@ -54,8 +54,8 @@ msgstr ""
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po || exit 1
-LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out || exit 1
+${MSGATTRIB} --clear-fuzzy -o ma-test9.tmp ma-test9.po || Exit 1
+LC_ALL=C tr -d '\r' < ma-test9.tmp > ma-test9.out || Exit 1
 
 cat <<\EOF > ma-test9.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgattrib-properties-1 b/gettext-tools/tests/msgattrib-properties-1
index 4a5c523..2c25c1f 100755
--- a/gettext-tools/tests/msgattrib-properties-1
+++ b/gettext-tools/tests/msgattrib-properties-1
@@ -30,8 +30,8 @@ with\ wives\ who\ never\ understand=und ihre Frauen verstehen sie nicht
 EOF
 
 : ${MSGATTRIB=msgattrib}
-${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties || exit 1
-LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out || exit 1
+${MSGATTRIB} --translated --properties-input --properties-output -o ma-s-1.tmp ma-s-1.properties || Exit 1
+LC_ALL=C tr -d '\r' < ma-s-1.tmp > ma-s-1.out || Exit 1
 
 cat <<\EOF > ma-s-1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgcat-1 b/gettext-tools/tests/msgcat-1
index 189c95b..a554e8a 100755
--- a/gettext-tools/tests/msgcat-1
+++ b/gettext-tools/tests/msgcat-1
@@ -39,8 +39,8 @@ msgstr "eins"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out || exit 1
+${MSGCAT} -o mcat-test1.tmp mcat-test1.in1 mcat-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test1.tmp > mcat-test1.out || Exit 1
 
 cat << EOF > mcat-test1.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-10 b/gettext-tools/tests/msgcat-10
index 624d8c3..a84e001 100755
--- a/gettext-tools/tests/msgcat-10
+++ b/gettext-tools/tests/msgcat-10
@@ -60,8 +60,8 @@ rm -f mcat-test10.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test10.tmp \
-    mcat-test10.in1 mcat-test10.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out || exit 1
+    mcat-test10.in1 mcat-test10.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test10.tmp > mcat-test10.out || Exit 1
 
 cat <<\EOF > mcat-test10.ok
 # #-#-#-#-#  mcat-test10.in1 (xyz)  #-#-#-#-#
diff --git a/gettext-tools/tests/msgcat-11 b/gettext-tools/tests/msgcat-11
index 24854b6..0f6a05a 100755
--- a/gettext-tools/tests/msgcat-11
+++ b/gettext-tools/tests/msgcat-11
@@ -31,8 +31,8 @@ msgstr "immer"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test11.tmp mcat-test11.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out || exit 1
+${MSGCAT} -o mcat-test11.tmp mcat-test11.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test11.tmp > mcat-test11.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mcat-test11.in mcat-test11.out
diff --git a/gettext-tools/tests/msgcat-12 b/gettext-tools/tests/msgcat-12
index 31a1528..41182cf 100755
--- a/gettext-tools/tests/msgcat-12
+++ b/gettext-tools/tests/msgcat-12
@@ -44,6 +44,6 @@ EOF
 rm -f mcat-test12.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} -o mcat-test12.out mcat-test12.in1 mcat-test12.in2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgcat-13 b/gettext-tools/tests/msgcat-13
index 9f972eb..44d7658 100755
--- a/gettext-tools/tests/msgcat-13
+++ b/gettext-tools/tests/msgcat-13
@@ -67,8 +67,8 @@ EOF
 
 rm -f mcat-test13.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out || exit 1
+${MSGCAT} -o mcat-test13.tmp mcat-test13.in1 mcat-test13.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test13.tmp > mcat-test13.out || Exit 1
 
 cat <<\EOF > mcat-test13.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-14 b/gettext-tools/tests/msgcat-14
index 475e9e6..21a544b 100755
--- a/gettext-tools/tests/msgcat-14
+++ b/gettext-tools/tests/msgcat-14
@@ -68,6 +68,6 @@ EOF
 rm -f mcat-test14.out
 : ${MSGCAT=msgcat}
 ${MSGCAT} -o mcat-test14.out mcat-test14.in1 mcat-test14.in2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgcat-15 b/gettext-tools/tests/msgcat-15
index 046502c..7731e5b 100755
--- a/gettext-tools/tests/msgcat-15
+++ b/gettext-tools/tests/msgcat-15
@@ -43,8 +43,8 @@ EOF
 
 rm -f mcat-test15.tmp1
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 || exit 1
+${MSGCAT} -o mcat-test15.tmp1 mcat-test15.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test15.tmp1 > mcat-test15.out1 || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mcat-test15.in mcat-test15.out1
@@ -52,8 +52,8 @@ result=$?
 
 rm -f mcat-test15.tmp2
 : ${MSGCAT=msgcat}
-${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 || exit 1
+${MSGCAT} --indent -o mcat-test15.tmp2 mcat-test15.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test15.tmp2 > mcat-test15.out2 || Exit 1
 
 cat <<\EOF > mcat-test15.ok
 msgid   ""
diff --git a/gettext-tools/tests/msgcat-16 b/gettext-tools/tests/msgcat-16
index 7a8a479..424be01 100755
--- a/gettext-tools/tests/msgcat-16
+++ b/gettext-tools/tests/msgcat-16
@@ -43,8 +43,8 @@ EOF
 
 rm -f mcat-test16.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out || exit 1
+${MSGCAT} -o mcat-test16.tmp mcat-test16.in1 mcat-test16.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test16.tmp > mcat-test16.out || Exit 1
 
 cat <<\EOF > mcat-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-17 b/gettext-tools/tests/msgcat-17
index 40bc785..8fecc40 100755
--- a/gettext-tools/tests/msgcat-17
+++ b/gettext-tools/tests/msgcat-17
@@ -20,8 +20,8 @@ EOF
 
 rm -f mcat-test17.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out || exit 1
+${MSGCAT} -o mcat-test17.tmp --width=80 mcat-test17.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test17.tmp > mcat-test17.out || Exit 1
 
 cat <<\EOF > mcat-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-18 b/gettext-tools/tests/msgcat-18
index afe9d57..03170f6 100755
--- a/gettext-tools/tests/msgcat-18
+++ b/gettext-tools/tests/msgcat-18
@@ -55,8 +55,8 @@ EOF
 
 rm -f mcat-test18.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out || exit 1
+${MSGCAT} -o mcat-test18.tmp mcat-test18.in1 mcat-test18.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test18.tmp > mcat-test18.out || Exit 1
 
 cat <<\EOF > mcat-test18.ok
 #, c-format
diff --git a/gettext-tools/tests/msgcat-19 b/gettext-tools/tests/msgcat-19
index 4dd2a40..7068a83 100755
--- a/gettext-tools/tests/msgcat-19
+++ b/gettext-tools/tests/msgcat-19
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --add-location=file \
-          -o mcat-test19.tmp mcat-test19.in1 mcat-test19.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test19.tmp > mcat-test19.out || exit 1
+          -o mcat-test19.tmp mcat-test19.in1 mcat-test19.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test19.tmp > mcat-test19.out || Exit 1
 
 cat << EOF > mcat-test19.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcat-2 b/gettext-tools/tests/msgcat-2
index 11439f9..f4caa61 100755
--- a/gettext-tools/tests/msgcat-2
+++ b/gettext-tools/tests/msgcat-2
@@ -58,8 +58,8 @@ ${MSGCAT} --more-than=0 -o mcat-test2.tmp \
     mcat-test2.in1 mcat-test2.in2 >mcat-test2.err 2>&1
 result=$?
 cat mcat-test2.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test2.tmp > mcat-test2.out || Exit 1
 
 cat << \EOF > mcat-test2.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-20 b/gettext-tools/tests/msgcat-20
index 2960fb6..8685f65 100755
--- a/gettext-tools/tests/msgcat-20
+++ b/gettext-tools/tests/msgcat-20
@@ -30,8 +30,8 @@ msgstr "4"
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} --sort-by-file -o mcat-test20.tmp mcat-test20.in || exit 1
-LC_ALL=C tr -d '\r' < mcat-test20.tmp > mcat-test20.out || exit 1
+${MSGCAT} --sort-by-file -o mcat-test20.tmp mcat-test20.in || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test20.tmp > mcat-test20.out || Exit 1
 
 cat << EOF > mcat-test20.ok
 #: clients/inst_language.ycp:103
diff --git a/gettext-tools/tests/msgcat-3 b/gettext-tools/tests/msgcat-3
index 990b612..bf757c4 100755
--- a/gettext-tools/tests/msgcat-3
+++ b/gettext-tools/tests/msgcat-3
@@ -59,8 +59,8 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test3.tmp \
     mcat-test3.in1 mcat-test3.in2 >mcat-test3.err 2>&1
 result=$?
 cat mcat-test3.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test3.tmp > mcat-test3.out || Exit 1
 
 cat << \EOF > mcat-test3.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-4 b/gettext-tools/tests/msgcat-4
index b593fd4..5e9a3bc 100755
--- a/gettext-tools/tests/msgcat-4
+++ b/gettext-tools/tests/msgcat-4
@@ -59,8 +59,8 @@ ${MSGCAT} --use-first --more-than=0 -o mcat-test4.tmp \
     mcat-test4.in1 mcat-test4.in2 >mcat-test4.err 2>&1
 result=$?
 cat mcat-test4.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-test4.tmp > mcat-test4.out || Exit 1
 
 cat << \EOF > mcat-test4.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-5 b/gettext-tools/tests/msgcat-5
index 8cdde50..ced04e2 100755
--- a/gettext-tools/tests/msgcat-5
+++ b/gettext-tools/tests/msgcat-5
@@ -56,8 +56,8 @@ rm -f mcat-test5.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 -o mcat-test5.tmp \
-    mcat-test5.in1 mcat-test5.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out || exit 1
+    mcat-test5.in1 mcat-test5.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test5.tmp > mcat-test5.out || Exit 1
 
 cat << \EOF > mcat-test5.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-6 b/gettext-tools/tests/msgcat-6
index dbb2cff..969c88d 100755
--- a/gettext-tools/tests/msgcat-6
+++ b/gettext-tools/tests/msgcat-6
@@ -56,8 +56,8 @@ rm -f mcat-test6.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test6.tmp \
-    mcat-test6.in1 mcat-test6.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out || exit 1
+    mcat-test6.in1 mcat-test6.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test6.tmp > mcat-test6.out || Exit 1
 
 cat << \EOF > mcat-test6.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-7 b/gettext-tools/tests/msgcat-7
index 9a11f27..93890e3 100755
--- a/gettext-tools/tests/msgcat-7
+++ b/gettext-tools/tests/msgcat-7
@@ -17,8 +17,8 @@ EOF
 
 rm -f mcat-test7.tmp
 : ${MSGCAT=msgcat}
-${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out || exit 1
+${MSGCAT} --sort-output -o mcat-test7.tmp mcat-test7.in1 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test7.tmp > mcat-test7.out || Exit 1
 
 cat << EOF > mcat-test7.ok
 #: clients/inst_language.ycp:108
diff --git a/gettext-tools/tests/msgcat-8 b/gettext-tools/tests/msgcat-8
index f757138..d8f0765 100755
--- a/gettext-tools/tests/msgcat-8
+++ b/gettext-tools/tests/msgcat-8
@@ -57,8 +57,8 @@ rm -f mcat-test8.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test8.tmp \
-    mcat-test8.in1 mcat-test8.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out || exit 1
+    mcat-test8.in1 mcat-test8.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test8.tmp > mcat-test8.out || Exit 1
 
 cat <<\EOF > mcat-test8.ok
 # #-#-#-#-#  mcat-test8.in1 (xyz)  #-#-#-#-#
diff --git a/gettext-tools/tests/msgcat-9 b/gettext-tools/tests/msgcat-9
index 54f6cf1..558e623 100755
--- a/gettext-tools/tests/msgcat-9
+++ b/gettext-tools/tests/msgcat-9
@@ -56,8 +56,8 @@ rm -f mcat-test9.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --more-than=0 -o mcat-test9.tmp \
-    mcat-test9.in1 mcat-test9.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out || exit 1
+    mcat-test9.in1 mcat-test9.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-test9.tmp > mcat-test9.out || Exit 1
 
 cat <<\EOF > mcat-test9.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcat-properties-1 b/gettext-tools/tests/msgcat-properties-1
index 1c53524..5d2263a 100755
--- a/gettext-tools/tests/msgcat-properties-1
+++ b/gettext-tools/tests/msgcat-properties-1
@@ -19,8 +19,8 @@ rm -f mcat-p-1.tmp
 
 : ${MSGCAT=msgcat}
 ${MSGCAT} --use-first --more-than=0 --properties-input --properties-output \
-    -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out || exit 1
+    -o mcat-p-1.tmp mcat-p-1.in1 mcat-p-1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcat-p-1.tmp > mcat-p-1.out || Exit 1
 
 cat << \EOF > mcat-p-1.ok
 #. Help text (HTML-like) START
diff --git a/gettext-tools/tests/msgcat-properties-2 b/gettext-tools/tests/msgcat-properties-2
index 3c57dea..badc6f3 100755
--- a/gettext-tools/tests/msgcat-properties-2
+++ b/gettext-tools/tests/msgcat-properties-2
@@ -10,7 +10,7 @@ exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6
 EOF
 
 : ${MSGCAT=msgcat}
-${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties || exit 1
+${MSGCAT} --properties-input --properties-output -t Big5 -o mcat-p-2.out mcat-p-2.properties || Exit 1
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
diff --git a/gettext-tools/tests/msgcat-stringtable-1 b/gettext-tools/tests/msgcat-stringtable-1
index 2ab9295..355b836 100755
--- a/gettext-tools/tests/msgcat-stringtable-1
+++ b/gettext-tools/tests/msgcat-stringtable-1
@@ -30,8 +30,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGCAT} --stringtable-input -o mcat-s-1.tmp mcat-s-1.in >mcat-s-1.err 2>&1
 result=$?
 cat mcat-s-1.err | grep -v ': internationalized messages'
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcat-s-1.tmp > mcat-s-1.out || Exit 1
 
 cat << \EOF > mcat-s-1.ok
 # This is an example of a string table file. Everything inside a comment
diff --git a/gettext-tools/tests/msgcmp-4 b/gettext-tools/tests/msgcmp-4
index 1f80683..dd077f8 100755
--- a/gettext-tools/tests/msgcmp-4
+++ b/gettext-tools/tests/msgcmp-4
@@ -86,17 +86,17 @@ EOF
 # Verify that with fuzzies, all msgids of the POT file are covered.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 || exit 1
+${MSGCMP} --use-fuzzy mc-test4.po1 mc-test4.pot > mc-test4.out11 2>&1 || Exit 1
 if grep -v 'warning:' mc-test4.out11 > /dev/null; then
-  exit 1;
+  Exit 1;
 fi
 
 # Verify that without fuzzies, not all msgids of the POT file are covered.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
 ${MSGCMP} mc-test4.po1 mc-test4.pot > mc-test4.out12 2>&1
-test $? = 1 || { exit 1; }
-grep -v 'warning:' mc-test4.out12 > /dev/null || exit 1
+test $? = 1 || { Exit 1; }
+grep -v 'warning:' mc-test4.out12 > /dev/null || Exit 1
 
 cat <<\EOF > mc-test4.po2
 msgid ""
@@ -144,9 +144,9 @@ EOF
 # messages.
 : ${MSGCMP=msgcmp}
 LC_MESSAGES=C LC_ALL= \
-${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 || exit 1
+${MSGCMP} mc-test4.po2 mc-test4.pot > mc-test4.out2 2>&1 || Exit 1
 if grep -v 'warning:' mc-test4.out2 > /dev/null; then
-  exit 1;
+  Exit 1;
 fi
 
 exit $result
diff --git a/gettext-tools/tests/msgcomm-1 b/gettext-tools/tests/msgcomm-1
index 52b8e0a..67ab936 100755
--- a/gettext-tools/tests/msgcomm-1
+++ b/gettext-tools/tests/msgcomm-1
@@ -16,8 +16,8 @@ msgstr "2x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test1.tmp mcomm-test1.in1 mcomm-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test1.tmp > mcomm-test1.out || Exit 1
 
 cat << EOF > mcomm-test1.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-10 b/gettext-tools/tests/msgcomm-10
index 71402f4..7dca8c0 100755
--- a/gettext-tools/tests/msgcomm-10
+++ b/gettext-tools/tests/msgcomm-10
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test10.tmp \
-    mcomm-test10.in1 mcomm-test10.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out || exit 1
+    mcomm-test10.in1 mcomm-test10.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test10.tmp > mcomm-test10.out || Exit 1
 
 cat << EOF > mcomm-test10.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-11 b/gettext-tools/tests/msgcomm-11
index 7994cec..cecee3f 100755
--- a/gettext-tools/tests/msgcomm-11
+++ b/gettext-tools/tests/msgcomm-11
@@ -43,8 +43,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location --omit-header -o mcomm-test11.tmp \
-    mcomm-test11.in1 mcomm-test11.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out || exit 1
+    mcomm-test11.in1 mcomm-test11.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test11.tmp > mcomm-test11.out || Exit 1
 
 cat << EOF > mcomm-test11.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-12 b/gettext-tools/tests/msgcomm-12
index 3f494f3..8c7ff78 100755
--- a/gettext-tools/tests/msgcomm-12
+++ b/gettext-tools/tests/msgcomm-12
@@ -65,8 +65,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test12.tmp \
-    mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out || exit 1
+    mcomm-test12.in1 mcomm-test12.in2 mcomm-test12.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test12.tmp > mcomm-test12.out || Exit 1
 
 cat << EOF > mcomm-test12.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-13 b/gettext-tools/tests/msgcomm-13
index 04eebb4..9f21eab 100755
--- a/gettext-tools/tests/msgcomm-13
+++ b/gettext-tools/tests/msgcomm-13
@@ -68,8 +68,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test13.tmp \
-    mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out || exit 1
+    mcomm-test13.in1 mcomm-test13.in2 mcomm-test13.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test13.tmp > mcomm-test13.out || Exit 1
 
 cat << EOF > mcomm-test13.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-14 b/gettext-tools/tests/msgcomm-14
index 6741a5a..3e0401b 100755
--- a/gettext-tools/tests/msgcomm-14
+++ b/gettext-tools/tests/msgcomm-14
@@ -63,8 +63,8 @@ EOF
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location --force-po -o mcomm-test14.tmp \
-    mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out || exit 1
+    mcomm-test14.in1 mcomm-test14.in2 mcomm-test14.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test14.tmp > mcomm-test14.out || Exit 1
 
 cat << EOF > mcomm-test14.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-15 b/gettext-tools/tests/msgcomm-15
index 291e349..043cf13 100755
--- a/gettext-tools/tests/msgcomm-15
+++ b/gettext-tools/tests/msgcomm-15
@@ -66,7 +66,7 @@ rm -f mcomm-test15.out
 # --unique is shorthand for --less-than=2; do we've to test both
 # switches?  Are 'for' loops allowed? -ke-
 ${MSGCOMM} --less-than=2 --no-location -o mcomm-test15.out \
-    mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 || exit 1
+    mcomm-test15.in1 mcomm-test15.in2 mcomm-test15.in3 || Exit 1
 
 # we've no unique msg; thus no PO should be created.
 if test -f mcomm-test15.out; then
diff --git a/gettext-tools/tests/msgcomm-16 b/gettext-tools/tests/msgcomm-16
index f0a3b13..6b7f6f3 100755
--- a/gettext-tools/tests/msgcomm-16
+++ b/gettext-tools/tests/msgcomm-16
@@ -58,8 +58,8 @@ ${MSGCOMM} --more-than=0 -o mcomm-test16.tmp \
     mcomm-test16.in1 mcomm-test16.in2 >mcomm-test16.err 2>&1
 result=$?
 cat mcomm-test16.err | grep -v 'warning: .* encodings' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mcomm-test16.tmp > mcomm-test16.out || Exit 1
 
 cat << \EOF > mcomm-test16.ok
 # German message file for xyz.
diff --git a/gettext-tools/tests/msgcomm-17 b/gettext-tools/tests/msgcomm-17
index 1867fe9..2ec6675 100755
--- a/gettext-tools/tests/msgcomm-17
+++ b/gettext-tools/tests/msgcomm-17
@@ -66,8 +66,8 @@ EOF
 
 ${MSGCOMM} -u \
            -o mcomm-test17.tmp \
-           mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out || exit 1
+           mcomm-test17.in1 mcomm-test17.in2 mcomm-test17.in3 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test17.tmp > mcomm-test17.out || Exit 1
 
 cat << \EOF > mcomm-test17.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-18 b/gettext-tools/tests/msgcomm-18
index d57af85..2dab53e 100755
--- a/gettext-tools/tests/msgcomm-18
+++ b/gettext-tools/tests/msgcomm-18
@@ -18,8 +18,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test18.tmp mcomm-test18.in1 mcomm-test18.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test18.tmp > mcomm-test18.out || Exit 1
 
 cat << EOF > mcomm-test18.ok
 # Sure.
diff --git a/gettext-tools/tests/msgcomm-19 b/gettext-tools/tests/msgcomm-19
index 2587bc4..0b693ad 100755
--- a/gettext-tools/tests/msgcomm-19
+++ b/gettext-tools/tests/msgcomm-19
@@ -20,8 +20,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test19.tmp mcomm-test19.in1 mcomm-test19.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test19.tmp > mcomm-test19.out || Exit 1
 
 cat << EOF > mcomm-test19.ok
 # Not sure.
diff --git a/gettext-tools/tests/msgcomm-2 b/gettext-tools/tests/msgcomm-2
index ae26bd0..f93d58d 100755
--- a/gettext-tools/tests/msgcomm-2
+++ b/gettext-tools/tests/msgcomm-2
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test2.tmp \
-    mcomm-test2.in1 mcomm-test2.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out || exit 1
+    mcomm-test2.in1 mcomm-test2.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test2.tmp > mcomm-test2.out || Exit 1
 
 cat << EOF > mcomm-test2.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-20 b/gettext-tools/tests/msgcomm-20
index 69b2ff1..3beb31c 100755
--- a/gettext-tools/tests/msgcomm-20
+++ b/gettext-tools/tests/msgcomm-20
@@ -21,8 +21,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test20.tmp \
-    mcomm-test20.in1 mcomm-test20.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out || exit 1
+    mcomm-test20.in1 mcomm-test20.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test20.tmp > mcomm-test20.out || Exit 1
 
 cat << EOF > mcomm-test20.ok
 # Sure.
diff --git a/gettext-tools/tests/msgcomm-21 b/gettext-tools/tests/msgcomm-21
index 9d3adc2..fa32600 100755
--- a/gettext-tools/tests/msgcomm-21
+++ b/gettext-tools/tests/msgcomm-21
@@ -21,8 +21,8 @@ msgstr "1x"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test21.tmp mcomm-test21.in1 mcomm-test21.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test21.tmp > mcomm-test21.out || Exit 1
 
 cat << EOF > mcomm-test21.ok
 # Not sure.
diff --git a/gettext-tools/tests/msgcomm-22 b/gettext-tools/tests/msgcomm-22
index 6b07432..72f3807 100755
--- a/gettext-tools/tests/msgcomm-22
+++ b/gettext-tools/tests/msgcomm-22
@@ -64,8 +64,8 @@ rm -f mcomm-test22.tmp
 : ${MSGCOMM=msgcomm}
 
 ${MSGCOMM} --less-than=2 -o mcomm-test22.tmp \
-    mcomm-test22.in1 mcomm-test22.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out || exit 1
+    mcomm-test22.in1 mcomm-test22.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test22.tmp > mcomm-test22.out || Exit 1
 
 cat << \EOF > mcomm-test22.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msgcomm-23 b/gettext-tools/tests/msgcomm-23
index c9d7846..873ba6c 100755
--- a/gettext-tools/tests/msgcomm-23
+++ b/gettext-tools/tests/msgcomm-23
@@ -7,8 +7,8 @@ cp "$abs_srcdir"/msguniq-a.in mcomm-23.in1
 cp "$abs_srcdir"/msguniq-a.in mcomm-23.in2
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out || exit 1
+${MSGCOMM} -w 1000 -o mcomm-23.tmp mcomm-23.in1 mcomm-23.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-23.tmp > mcomm-23.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/msguniq-a.out mcomm-23.out
diff --git a/gettext-tools/tests/msgcomm-24 b/gettext-tools/tests/msgcomm-24
index f56f378..2cc5f95 100755
--- a/gettext-tools/tests/msgcomm-24
+++ b/gettext-tools/tests/msgcomm-24
@@ -14,8 +14,8 @@ cat <<EOF > mcomm-test24.in2
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out || exit 1
+${MSGCOMM} --more-than=0 --properties-input --properties-output -o mcomm-test24.tmp mcomm-test24.in1 mcomm-test24.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test24.tmp > mcomm-test24.out || Exit 1
 
 cat << EOF > mcomm-test24.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-25 b/gettext-tools/tests/msgcomm-25
index 0b766b6..3a04b8a 100755
--- a/gettext-tools/tests/msgcomm-25
+++ b/gettext-tools/tests/msgcomm-25
@@ -66,8 +66,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out || exit 1
+${MSGCOMM} --more-than=0 -o mcomm-test25.tmp mcomm-test25.in1 mcomm-test25.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test25.tmp > mcomm-test25.out || Exit 1
 
 cat <<\EOF > mcomm-test25.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-26 b/gettext-tools/tests/msgcomm-26
index dfb3ab9..64ac62e 100755
--- a/gettext-tools/tests/msgcomm-26
+++ b/gettext-tools/tests/msgcomm-26
@@ -68,8 +68,8 @@ msgstr "%s: ungültige Optionen -- %c\n"
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out || exit 1
+${MSGCOMM} -o mcomm-test26.tmp mcomm-test26.in1 mcomm-test26.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test26.tmp > mcomm-test26.out || Exit 1
 
 cat <<\EOF > mcomm-test26.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-27 b/gettext-tools/tests/msgcomm-27
index b11a0eb..fda523e 100755
--- a/gettext-tools/tests/msgcomm-27
+++ b/gettext-tools/tests/msgcomm-27
@@ -54,8 +54,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGCOMM=msgcomm}
-${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out || exit 1
+${MSGCOMM} -o mcomm-test27.tmp mcomm-test27.in1 mcomm-test27.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test27.tmp > mcomm-test27.out || Exit 1
 
 cat << EOF > mcomm-test27.ok
 #, c-format
diff --git a/gettext-tools/tests/msgcomm-28 b/gettext-tools/tests/msgcomm-28
index 665ab0a..48f7761 100755
--- a/gettext-tools/tests/msgcomm-28
+++ b/gettext-tools/tests/msgcomm-28
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --add-location=file --more-than=0 \
-           -o mcomm-test28.tmp mcomm-test28.in1 mcomm-test28.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test28.tmp > mcomm-test28.out || exit 1
+           -o mcomm-test28.tmp mcomm-test28.in1 mcomm-test28.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test28.tmp > mcomm-test28.out || Exit 1
 
 cat << EOF > mcomm-test28.ok
 #: first.c
diff --git a/gettext-tools/tests/msgcomm-3 b/gettext-tools/tests/msgcomm-3
index d5871e5..67baccd 100755
--- a/gettext-tools/tests/msgcomm-3
+++ b/gettext-tools/tests/msgcomm-3
@@ -17,8 +17,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test3.tmp \
-    mcomm-test3.in1 mcomm-test3.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out || exit 1
+    mcomm-test3.in1 mcomm-test3.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test3.tmp > mcomm-test3.out || Exit 1
 
 cat << EOF > mcomm-test3.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-4 b/gettext-tools/tests/msgcomm-4
index de9c9c1..a292da4 100755
--- a/gettext-tools/tests/msgcomm-4
+++ b/gettext-tools/tests/msgcomm-4
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 -o mcomm-test4.tmp \
-    mcomm-test4.in1 mcomm-test4.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out || exit 1
+    mcomm-test4.in1 mcomm-test4.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test4.tmp > mcomm-test4.out || Exit 1
 
 cat << EOF > mcomm-test4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-5 b/gettext-tools/tests/msgcomm-5
index d17467d..1eb7acd 100755
--- a/gettext-tools/tests/msgcomm-5
+++ b/gettext-tools/tests/msgcomm-5
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --omit-header -o mcomm-test5.tmp \
-    mcomm-test5.in1 mcomm-test5.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out || exit 1
+    mcomm-test5.in1 mcomm-test5.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test5.tmp > mcomm-test5.out || Exit 1
 
 cat << EOF > mcomm-test5.ok
 #: first.c:123
diff --git a/gettext-tools/tests/msgcomm-6 b/gettext-tools/tests/msgcomm-6
index 9b0a5a1..634d8db 100755
--- a/gettext-tools/tests/msgcomm-6
+++ b/gettext-tools/tests/msgcomm-6
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location -o mcomm-test6.tmp \
-    mcomm-test6.in1 mcomm-test6.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out || exit 1
+    mcomm-test6.in1 mcomm-test6.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test6.tmp > mcomm-test6.out || Exit 1
 
 cat << EOF > mcomm-test6.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-7 b/gettext-tools/tests/msgcomm-7
index 1b5c812..b098ec7 100755
--- a/gettext-tools/tests/msgcomm-7
+++ b/gettext-tools/tests/msgcomm-7
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=0 --no-location --omit-header -o mcomm-test7.tmp \
-    mcomm-test7.in1 mcomm-test7.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out || exit 1
+    mcomm-test7.in1 mcomm-test7.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test7.tmp > mcomm-test7.out || Exit 1
 
 cat << EOF > mcomm-test7.ok
 msgid "1"
diff --git a/gettext-tools/tests/msgcomm-8 b/gettext-tools/tests/msgcomm-8
index e08e70f..582deff 100755
--- a/gettext-tools/tests/msgcomm-8
+++ b/gettext-tools/tests/msgcomm-8
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 -o mcomm-test8.tmp \
-    mcomm-test8.in1 mcomm-test8.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out || exit 1
+    mcomm-test8.in1 mcomm-test8.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test8.tmp > mcomm-test8.out || Exit 1
 
 cat << EOF > mcomm-test8.ok
 msgid ""
diff --git a/gettext-tools/tests/msgcomm-9 b/gettext-tools/tests/msgcomm-9
index 632ec1f..fdb37b9 100755
--- a/gettext-tools/tests/msgcomm-9
+++ b/gettext-tools/tests/msgcomm-9
@@ -39,8 +39,8 @@ EOF
 
 : ${MSGCOMM=msgcomm}
 ${MSGCOMM} --more-than=1 --no-location -o mcomm-test9.tmp \
-    mcomm-test9.in1 mcomm-test9.in2 || exit 1
-LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out || exit 1
+    mcomm-test9.in1 mcomm-test9.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mcomm-test9.tmp > mcomm-test9.out || Exit 1
 
 cat << EOF > mcomm-test9.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-1 b/gettext-tools/tests/msgconv-1
index 148f982..810e37d 100755
--- a/gettext-tools/tests/msgconv-1
+++ b/gettext-tools/tests/msgconv-1
@@ -18,7 +18,7 @@ msgstr "
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po || exit 1
+${MSGCONV} --to-code=UTF-8 -o mco-test1.out mco-test1.po || Exit 1
 
 cat <<\EOF > mco-test1.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgconv-2 b/gettext-tools/tests/msgconv-2
index 936197c..5e4e027 100755
--- a/gettext-tools/tests/msgconv-2
+++ b/gettext-tools/tests/msgconv-2
@@ -19,7 +19,7 @@ msgstr "此功能需要恰好指定兩個輸入檔"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || exit 1
+${MSGCONV} -t Big5 -o mco-test2.out mco-test2.po || Exit 1
 
 cat <<\EOF > mco-test2.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgconv-4 b/gettext-tools/tests/msgconv-4
index b901142..5cddce7 100755
--- a/gettext-tools/tests/msgconv-4
+++ b/gettext-tools/tests/msgconv-4
@@ -10,7 +10,7 @@ exactly\ 2\ input\ files\ required=\u6b64\u529f\u80fd\u9700\u8981\u6070\u597d\u6
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties || exit 1
+${MSGCONV} --properties-input --properties-output -t Big5 -o mco-test4.out mco-test4.properties || Exit 1
 
 : ${DIFF=diff}
 # Redirect stdout, so as not to fill the user's screen with non-ASCII bytes.
diff --git a/gettext-tools/tests/msgconv-5 b/gettext-tools/tests/msgconv-5
index 800805f..4d20384 100755
--- a/gettext-tools/tests/msgconv-5
+++ b/gettext-tools/tests/msgconv-5
@@ -49,8 +49,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po || exit 1
-LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out || exit 1
+${MSGCONV} --to-code=UTF-8 -o mco-test5.tmp mco-test5.po || Exit 1
+LC_ALL=C tr -d '\r' < mco-test5.tmp > mco-test5.out || Exit 1
 
 cat <<\EOF > mco-test5.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-6 b/gettext-tools/tests/msgconv-6
index c4e9844..fbb29bf 100755
--- a/gettext-tools/tests/msgconv-6
+++ b/gettext-tools/tests/msgconv-6
@@ -22,8 +22,8 @@ msgstr "Volle 360 Grad"
 EOF
 
 : ${MSGCONV=msgconv}
-${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po || exit 1
-LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out || exit 1
+${MSGCONV} --to-code=ISO-8859-1 -o mco-test6.tmp mco-test6.po || Exit 1
+LC_ALL=C tr -d '\r' < mco-test6.tmp > mco-test6.out || Exit 1
 
 cat <<\EOF > mco-test6.ok
 msgid ""
diff --git a/gettext-tools/tests/msgconv-7 b/gettext-tools/tests/msgconv-7
index 2d1fa65..f07cc54 100755
--- a/gettext-tools/tests/msgconv-7
+++ b/gettext-tools/tests/msgconv-7
@@ -19,7 +19,7 @@ EOF
 
 : ${MSGCONV=msgconv}
 ${MSGCONV} --add-location=file --to-code=UTF-8 \
-           -o mco-test7.out mco-test7.po || exit 1
+           -o mco-test7.out mco-test7.po || Exit 1
 
 cat <<\EOF > mco-test7.ok
 # Chinese translation for GNU gettext messages.
diff --git a/gettext-tools/tests/msgen-1 b/gettext-tools/tests/msgen-1
index 9b02ffa..893c8cd 100755
--- a/gettext-tools/tests/msgen-1
+++ b/gettext-tools/tests/msgen-1
@@ -27,8 +27,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} -o men-test1.tmp men-test1.po || exit 1
-LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || exit 1
+${MSGEN} -o men-test1.tmp men-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1
 
 cat <<EOF > men-test1.ok
 # HEADER.
@@ -59,9 +59,9 @@ result=$?
 test $result = 0 || exit $result
 
 # Test --lang option.
-${MSGEN} --lang=fr -o men-test1.tmp men-test1.po || exit 1
-grep "Language: fr" men-test1.tmp 2>&1 >/dev/null || exit 1
-grep -v "Language: fr" men-test1.tmp | LC_ALL=C tr -d '\r' > men-test1.out || exit 1
+${MSGEN} --lang=fr -o men-test1.tmp men-test1.po || Exit 1
+grep "Language: fr" men-test1.tmp 2>&1 >/dev/null || Exit 1
+grep -v "Language: fr" men-test1.tmp | LC_ALL=C tr -d '\r' > men-test1.out || Exit 1
 
 ${DIFF} men-test1.ok men-test1.out
 result=$?
diff --git a/gettext-tools/tests/msgen-2 b/gettext-tools/tests/msgen-2
index 170ebd7..b910869 100755
--- a/gettext-tools/tests/msgen-2
+++ b/gettext-tools/tests/msgen-2
@@ -12,8 +12,8 @@ width\ must\ be\ positive=
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || exit 1
-LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || exit 1
+${MSGEN} --properties-input --properties-output -o men-test2.tmp men-test2.properties || Exit 1
+LC_ALL=C tr -d '\r' < men-test2.tmp > men-test2.out || Exit 1
 
 cat <<\EOF > men-test2.ok
 height\ must\ be\ positive=height must be positive
diff --git a/gettext-tools/tests/msgen-3 b/gettext-tools/tests/msgen-3
index 2b09c1d..9db7e67 100755
--- a/gettext-tools/tests/msgen-3
+++ b/gettext-tools/tests/msgen-3
@@ -41,8 +41,8 @@ msgstr ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} -o men-test3.tmp men-test3.pot || exit 1
-LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out || exit 1
+${MSGEN} -o men-test3.tmp men-test3.pot || Exit 1
+LC_ALL=C tr -d '\r' < men-test3.tmp > men-test3.out || Exit 1
 
 cat <<\EOF > men-test3.ok
 msgid ""
diff --git a/gettext-tools/tests/msgen-4 b/gettext-tools/tests/msgen-4
index 6dddf5d..4867e9b 100755
--- a/gettext-tools/tests/msgen-4
+++ b/gettext-tools/tests/msgen-4
@@ -31,8 +31,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGEN=msgen}
-${MSGEN} --add-location=file -o men-test1.tmp men-test1.po || exit 1
-LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || exit 1
+${MSGEN} --add-location=file -o men-test1.tmp men-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < men-test1.tmp > men-test1.out || Exit 1
 
 cat <<EOF > men-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgexec-1 b/gettext-tools/tests/msgexec-1
index e9094fc..05c0445 100755
--- a/gettext-tools/tests/msgexec-1
+++ b/gettext-tools/tests/msgexec-1
@@ -72,7 +72,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test1.po ./mex-test1.sh > mex-test1.out 2> mex-test1.err
 result=$?
 cat mex-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test1.ok
 ========================= mex-test1.po:4 =========================
diff --git a/gettext-tools/tests/msgexec-2 b/gettext-tools/tests/msgexec-2
index fcdb078..02f4218 100755
--- a/gettext-tools/tests/msgexec-2
+++ b/gettext-tools/tests/msgexec-2
@@ -71,8 +71,8 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test2.po 0 > mex-test2.tmp 2> mex-test2.err
 result=$?
 cat mex-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C $TR -d '\r' < mex-test2.tmp > mex-test2.out || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/mex-test2.ok mex-test2.out >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgexec-3 b/gettext-tools/tests/msgexec-3
index 7955d63..4dff887 100755
--- a/gettext-tools/tests/msgexec-3
+++ b/gettext-tools/tests/msgexec-3
@@ -43,7 +43,7 @@ EOF
 chmod a+x mex-test3.sh
 
 : ${MSGEXEC=msgexec}
-${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out || exit 1
+${MSGEXEC} --properties-input -i mex-test3.properties ./mex-test3.sh > mex-test3.out || Exit 1
 
 cat <<\EOF > mex-test3.ok
 ========================= mex-test3.properties:3 =========================
diff --git a/gettext-tools/tests/msgexec-4 b/gettext-tools/tests/msgexec-4
index e786322..4fe0978 100755
--- a/gettext-tools/tests/msgexec-4
+++ b/gettext-tools/tests/msgexec-4
@@ -82,7 +82,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test4.po ./mex-test4.sh > mex-test4.out 2> mex-test4.err
 result=$?
 cat mex-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test4.ok
 ========================= mex-test4.po:2 =========================
diff --git a/gettext-tools/tests/msgexec-5 b/gettext-tools/tests/msgexec-5
index a2c13cd..b83a6aa 100755
--- a/gettext-tools/tests/msgexec-5
+++ b/gettext-tools/tests/msgexec-5
@@ -53,7 +53,7 @@ LC_ALL=C \
 ${MSGEXEC} -i mex-test5.po ./mex-test5.sh > mex-test5.out 2> mex-test5.err
 result=$?
 cat mex-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test5.ok
 ========================= mex-test5.po:2 =========================
diff --git a/gettext-tools/tests/msgexec-6 b/gettext-tools/tests/msgexec-6
index acea8bc..0edccf9 100755
--- a/gettext-tools/tests/msgexec-6
+++ b/gettext-tools/tests/msgexec-6
@@ -72,7 +72,7 @@ LC_ALL=C \
 ${MSGEXEC} --newline -i mex-test6.po ./mex-test6.sh > mex-test6.out 2> mex-test6.err
 result=$?
 cat mex-test6.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mex-test6.ok
 ========================= mex-test6.po:4 =========================
diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index c1569a0..ef3820d 100755
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test1.po
@@ -92,7 +92,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test1.po -o mfi-test1.out fold -b -s -w 20 >mfi-test1.err 2>&1
 result=$?
 cat mfi-test1.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test1.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2
index 036cb87..718dc10 100755
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -20,7 +20,7 @@ fi
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  Exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,7 +29,7 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test2.po
@@ -93,7 +93,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test2.po -o mfi-test2.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test2.err 2>&1
 result=$?
 cat mfi-test2.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test2.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index 02e74ec..7e76657 100755
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test3.properties
@@ -67,7 +67,7 @@ EOF
 LC_ALL=C \
 ${MSGFILTER} --properties-input --properties-output -i mfi-test3.properties -o mfi-test3.out fold -b -s -w 20
 result=$?
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test3.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4
index 6c9feee..6760b0f 100755
--- a/gettext-tools/tests/msgfilter-4
+++ b/gettext-tools/tests/msgfilter-4
@@ -20,7 +20,7 @@ fi
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
 test -n "$sedoutput" || {
   echo "Skipping test: sed program is broken"
-  exit 77
+  Exit 77
 }
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
@@ -29,7 +29,7 @@ sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
 test "$sedoutputcount" = 3 || {
   echo "Skipping test: sed program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test4.po
@@ -88,7 +88,7 @@ LC_ALL=C \
 ${MSGFILTER} -i mfi-test4.po -o mfi-test4.out sed -e "$sedexpr1" -e "$sedexpr2" >mfi-test4.err 2>&1
 result=$?
 cat mfi-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfilter-5 b/gettext-tools/tests/msgfilter-5
index 0a8da6f..21f08ee 100755
--- a/gettext-tools/tests/msgfilter-5
+++ b/gettext-tools/tests/msgfilter-5
@@ -19,13 +19,13 @@ fi
 # spaces.
 echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
   echo "Skipping test: fold program not POSIX compliant"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like NetBSD 5.0) remove trailing spaces when wrapping.
 echo ab cd | fold -b -s -w 3 | grep ' ' >/dev/null || {
   echo "Skipping test: fold program trims trailing spaces"
-  exit 77
+  Exit 77
 }
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
@@ -34,7 +34,7 @@ foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
 test "$foldoutputcount" = 3 || {
   echo "Skipping test: fold program inserts extra newline"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mfi-test5.po
@@ -92,7 +92,7 @@ LC_ALL=C ${MSGFILTER} --add-location=file -i mfi-test5.po -o mfi-test5.out \
       fold -b -s -w 20 >mfi-test5.err 2>&1
 result=$?
 cat mfi-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test5.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-6 b/gettext-tools/tests/msgfilter-6
index ddf7869..357dd45 100755
--- a/gettext-tools/tests/msgfilter-6
+++ b/gettext-tools/tests/msgfilter-6
@@ -53,7 +53,7 @@ ${MSGFILTER} -i mf-test6.po ./mf-test6.sh >/dev/null 2> mf-test6.err
 result=$?
 
 cat mf-test6.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 LC_ALL=C tr -d '\r' < mf-test6.tmp > mf-test6.out
 
diff --git a/gettext-tools/tests/msgfilter-7 b/gettext-tools/tests/msgfilter-7
index 791441b..8655c18 100755
--- a/gettext-tools/tests/msgfilter-7
+++ b/gettext-tools/tests/msgfilter-7
@@ -69,7 +69,7 @@ LC_ALL=C ${MSGFILTER} -i mfi-test7.po -o mfi-test7.out \
       ./mf-test7.sh >mfi-test7.err 2>&1
 result=$?
 cat mfi-test7.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test7.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-8 b/gettext-tools/tests/msgfilter-8
index 3ffcb5e..f7b7b27 100755
--- a/gettext-tools/tests/msgfilter-8
+++ b/gettext-tools/tests/msgfilter-8
@@ -81,9 +81,9 @@ LC_ALL=C ${MSGFILTER} --newline -i mfi-test8.po -o mfi-test8.out \
       ${CONFIG_SHELL} filter.sh >mfi-test8.err 2>&1
 result=$?
 cat mfi-test8.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 cat mfi-test8.err | grep 'msgfilter: filter output is not terminated with a newline' >/dev/null
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > mfi-test8.ok
 # HEADER.
diff --git a/gettext-tools/tests/msgfilter-quote-1 b/gettext-tools/tests/msgfilter-quote-1
index 28b429a..6dcb364 100755
--- a/gettext-tools/tests/msgfilter-quote-1
+++ b/gettext-tools/tests/msgfilter-quote-1
@@ -76,7 +76,7 @@ msgstr "``double grave'"
 EOF
 
 : ${MSGFILTER=msgfilter}
-LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-quot.out quot 2>&1 2>/dev/null || exit 1
+LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-quot.out quot 2>&1 2>/dev/null || Exit 1
 
 cat <<\EOF > mfi-quot.ok
 msgid ""
@@ -151,9 +151,9 @@ msgstr "`‘double grave’"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mfi-quot.ok mfi-quot.out || exit 1
+${DIFF} mfi-quot.ok mfi-quot.out || Exit 1
 
-LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-boldquot.out boldquot 2>&1 2>/dev/null || exit 1
+LC_ALL=C ${MSGFILTER} -i mfi.po -o mfi-boldquot.out boldquot 2>&1 2>/dev/null || Exit 1
 
 cat <<\EOF > mfi-boldquot.ok
 msgid ""
@@ -227,4 +227,4 @@ msgid "``double grave'"
 msgstr "`‘double grave’"
 EOF
 
-${DIFF} mfi-boldquot.ok mfi-boldquot.out || exit 1
+${DIFF} mfi-boldquot.ok mfi-boldquot.out || Exit 1
diff --git a/gettext-tools/tests/msgfilter-sr-latin-1 b/gettext-tools/tests/msgfilter-sr-latin-1
index 2999a62..c1cc978 100755
--- a/gettext-tools/tests/msgfilter-sr-latin-1
+++ b/gettext-tools/tests/msgfilter-sr-latin-1
@@ -309,12 +309,12 @@ EOF
 # of here documents in /bin/sh is too buggy. Skip the test in this case.
 head -n 1 mfi-srl-1.po | grep Serbian > /dev/null || {
   echo "Skipping test: /bin/sh is too buggy"
-  exit 77
+  Exit 77
 }
 
 : ${MSGFILTER=msgfilter}
-${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin || exit 1
-LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out || exit 1
+${MSGFILTER} -i mfi-srl-1.po -o mfi-srl-1.tmp recode-sr-latin || Exit 1
+LC_ALL=C tr -d '\r' < mfi-srl-1.tmp > mfi-srl-1.out || Exit 1
 
 cat <<\EOF > mfi-srl-1.ok
 # Serbian translation of gettext-runtime
diff --git a/gettext-tools/tests/msgfmt-1 b/gettext-tools/tests/msgfmt-1
index fd3981d..9bed6af 100755
--- a/gettext-tools/tests/msgfmt-1
+++ b/gettext-tools/tests/msgfmt-1
@@ -44,13 +44,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-module1.po mf-1-module2.po 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po || exit 1
-${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po || exit 1
+${MSGCAT} --use-first -o mf-1-modules.po mf-1-module1.po mf-1-module2.po || Exit 1
+${MSGFMT} -o mf-1/LC_MESSAGES/gen.mo mf-1-modules.po || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-1 \
diff --git a/gettext-tools/tests/msgfmt-10 b/gettext-tools/tests/msgfmt-10
index d747cf8..8b38f19 100755
--- a/gettext-tools/tests/msgfmt-10
+++ b/gettext-tools/tests/msgfmt-10
@@ -36,7 +36,7 @@ msgstr[1] "%d yarars
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-test10.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-test10.po1 || Exit 1
 
 cat <<\EOF > mf-test10.po2
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgfmt-12 b/gettext-tools/tests/msgfmt-12
index f3d1f38..19f9383 100755
--- a/gettext-tools/tests/msgfmt-12
+++ b/gettext-tools/tests/msgfmt-12
@@ -20,11 +20,11 @@ msgstr "<PRIXFAST16> Fehler"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-12.mo mf-12.po || exit 1
+${MSGFMT} -o mf-12.mo mf-12.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-12.tmp mf-12.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out || exit 1
+${MSGUNFMT} -o mf-12.tmp mf-12.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-12.tmp > mf-12.out || Exit 1
 
 cat <<\EOF > mf-12.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-14 b/gettext-tools/tests/msgfmt-14
index 3a44ac7..9e30ffe 100755
--- a/gettext-tools/tests/msgfmt-14
+++ b/gettext-tools/tests/msgfmt-14
@@ -49,11 +49,11 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-14.mo mf-14.po || exit 1
+${MSGFMT} -o mf-14.mo mf-14.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-14.tmp mf-14.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out || exit 1
+${MSGUNFMT} -o mf-14.tmp mf-14.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-14.tmp > mf-14.out || Exit 1
 
 cat <<\EOF > mf-14.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-15 b/gettext-tools/tests/msgfmt-15
index 5ff7c4b..ba5d516 100755
--- a/gettext-tools/tests/msgfmt-15
+++ b/gettext-tools/tests/msgfmt-15
@@ -37,7 +37,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po1 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po1 || Exit 1
 
 cat <<\EOF > mf-15.po2
 # SOME DESCRIPTIVE TITLE.
@@ -67,7 +67,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po2 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-15.po3
 # SOME DESCRIPTIVE TITLE.
@@ -96,7 +96,7 @@ msgstr[2] "%d der unnützen Nichtterminale"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-15.po3 || exit 1
+${MSGFMT} --check -o /dev/null mf-15.po3 || Exit 1
 
 cat <<\EOF > mf-15.po4
 # SOME DESCRIPTIVE TITLE.
@@ -126,6 +126,6 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-15.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 exit $result
diff --git a/gettext-tools/tests/msgfmt-16 b/gettext-tools/tests/msgfmt-16
index f2641f5..f5d9fca 100755
--- a/gettext-tools/tests/msgfmt-16
+++ b/gettext-tools/tests/msgfmt-16
@@ -42,11 +42,11 @@ msgstr "Argumente fehlen."
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mf-16.mo mf-16.po || exit 1
+${MSGFMT} -o mf-16.mo mf-16.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mf-16.tmp mf-16.mo || exit 1
-LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out || exit 1
+${MSGUNFMT} -o mf-16.tmp mf-16.mo || Exit 1
+LC_ALL=C tr -d '\r' < mf-16.tmp > mf-16.out || Exit 1
 
 cat <<\EOF > mf-16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-17 b/gettext-tools/tests/msgfmt-17
index cc98b96..8624d7e 100755
--- a/gettext-tools/tests/msgfmt-17
+++ b/gettext-tools/tests/msgfmt-17
@@ -37,7 +37,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po1 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-17.po2
 # SOME DESCRIPTIVE TITLE.
@@ -66,7 +66,7 @@ msgstr[2] "час и %(number)s четвертей"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o /dev/null mf-17.po2 || exit 1
+${MSGFMT} --check -o /dev/null mf-17.po2 || Exit 1
 
 cat <<\EOF > mf-17.po3
 # SOME DESCRIPTIVE TITLE.
@@ -96,7 +96,7 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po3 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 cat <<\EOF > mf-17.po4
 # SOME DESCRIPTIVE TITLE.
@@ -126,6 +126,6 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check -o /dev/null mf-17.po4 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 exit $result
diff --git a/gettext-tools/tests/msgfmt-18 b/gettext-tools/tests/msgfmt-18
index 3136ce8..cbc8976 100755
--- a/gettext-tools/tests/msgfmt-18
+++ b/gettext-tools/tests/msgfmt-18
@@ -28,8 +28,8 @@ EOF
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check-accelerators -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 : ${MSGFMT=msgfmt}
 ${MSGFMT} --check-accelerators='_' -o /dev/null mf-18.po 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
diff --git a/gettext-tools/tests/msgfmt-2 b/gettext-tools/tests/msgfmt-2
index 4a24487..4f52797 100755
--- a/gettext-tools/tests/msgfmt-2
+++ b/gettext-tools/tests/msgfmt-2
@@ -56,13 +56,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-module1.po mf-2-module2.po 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po || exit 1
-${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po || exit 1
+${MSGCAT} --use-first -o mf-2-modules.po mf-2-module1.po mf-2-module2.po || Exit 1
+${MSGFMT} -o mf-2/LC_MESSAGES/gen.mo mf-2-modules.po || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-2 \
diff --git a/gettext-tools/tests/msgfmt-3 b/gettext-tools/tests/msgfmt-3
index a46f88f..aab90b8 100755
--- a/gettext-tools/tests/msgfmt-3
+++ b/gettext-tools/tests/msgfmt-3
@@ -22,7 +22,7 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGFMT} -o mftest3.mo mf-test3.po >mftest3.err 2>&1
 result=$?
 cat mftest3.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 test ! -f mftest3.mo
 result=$?
diff --git a/gettext-tools/tests/msgfmt-5 b/gettext-tools/tests/msgfmt-5
index f4fb368..2820ebc 100755
--- a/gettext-tools/tests/msgfmt-5
+++ b/gettext-tools/tests/msgfmt-5
@@ -30,13 +30,13 @@ msgstr "A bient
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} foo.po || exit 1
+${MSGFMT} foo.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o foo-de.tmp foo-de.mo || exit 1
-LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out || exit 1
-${MSGUNFMT} -o foo-fr.tmp foo-fr.mo || exit 1
-LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out || exit 1
+${MSGUNFMT} -o foo-de.tmp foo-de.mo || Exit 1
+LC_ALL=C tr -d '\r' < foo-de.tmp > foo-de.out || Exit 1
+${MSGUNFMT} -o foo-fr.tmp foo-fr.mo || Exit 1
+LC_ALL=C tr -d '\r' < foo-fr.tmp > foo-fr.out || Exit 1
 
 cat <<\EOF > foo-de.ok
 msgid ""
diff --git a/gettext-tools/tests/msgfmt-desktop-1 b/gettext-tools/tests/msgfmt-desktop-1
index 18ca696..493c085 100755
--- a/gettext-tools/tests/msgfmt-desktop-1
+++ b/gettext-tools/tests/msgfmt-desktop-1
@@ -67,16 +67,16 @@ EOF
 
 ${MSGFMT} --desktop --template=mf.desktop -l fr fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop fr.po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
 ${MSGFMT} --desktop --template=mf.desktop -l fr fr.po -o mf.desktop.out \
-  || exit 1
+  || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.ok mf.desktop.out
diff --git a/gettext-tools/tests/msgfmt-desktop-2 b/gettext-tools/tests/msgfmt-desktop-2
index 5fbb75a..3a40b85 100755
--- a/gettext-tools/tests/msgfmt-desktop-2
+++ b/gettext-tools/tests/msgfmt-desktop-2
@@ -131,13 +131,13 @@ unset LINGUAS
 
 ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 test -d po/LINGUAS || mkdir po/LINGUAS
 
 ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 rm -fr po/LINGUAS
 
@@ -148,28 +148,28 @@ EOF
 
 ${MSGFMT} --desktop --template=mf.desktop -d po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out -l fr \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --desktop --template=mf.desktop -d po -o mf.desktop.out po/fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
-${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out || exit 1
+${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.ok mf.desktop.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
 
 # Restrict the desired languages with the LINGUAS envvar.
 
-LINGUAS="fr ja" ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.desired.out || exit 1
+LINGUAS="fr ja" ${MSGFMT} --desktop --template=mf.desktop -d po -o mf.desktop.desired.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.desktop.desired.ok mf.desktop.desired.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
diff --git a/gettext-tools/tests/msgfmt-properties-1 b/gettext-tools/tests/msgfmt-properties-1
index 8851cc9..fab406d 100755
--- a/gettext-tools/tests/msgfmt-properties-1
+++ b/gettext-tools/tests/msgfmt-properties-1
@@ -24,13 +24,13 @@ EOF
 # Without use of msgcat, expect a "duplicate message definition" error.
 : ${MSGFMT=msgfmt}
 if ${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-1.properties mf-p-1-2.properties 2> /dev/null; then
-  exit 1
+  Exit 1
 fi
 
 # With msgcat, it should work.
 : ${MSGCAT=msgcat} ${MSGFMT=msgfmt}
-${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties || exit 1
-${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties || exit 1
+${MSGCAT} --properties-input --properties-output --use-first -o mf-p-1-s.properties mf-p-1-1.properties mf-p-1-2.properties || Exit 1
+${MSGFMT} --properties-input -o mf-p-1/LC_MESSAGES/gen.mo mf-p-1-s.properties || Exit 1
 
 : ${GETTEXT=gettext}
 TEXTDOMAINDIR=. LANGUAGE=mf-p-1 \
diff --git a/gettext-tools/tests/msgfmt-qt-1 b/gettext-tools/tests/msgfmt-qt-1
index f5dff9d..0308580 100755
--- a/gettext-tools/tests/msgfmt-qt-1
+++ b/gettext-tools/tests/msgfmt-qt-1
@@ -4,7 +4,7 @@
 # Test output in Qt .qm format.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || exit 1
+${MSGFMT} --qt -o mf-qt-1.qm "$abs_srcdir"/qttest_pl.po || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest_pl.qm mf-qt-1.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgfmt-qt-2 b/gettext-tools/tests/msgfmt-qt-2
index 99cf145..482ef19 100755
--- a/gettext-tools/tests/msgfmt-qt-2
+++ b/gettext-tools/tests/msgfmt-qt-2
@@ -4,7 +4,7 @@
 # Test msgfmt --qt on a PO file with contexts.
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || exit 1
+${MSGFMT} --qt "$abs_srcdir"/qttest2_de.po -o mf-qt-2.qm || Exit 1
 
 : ${CMP=cmp}
 ${CMP} "$abs_srcdir"/qttest2_de.qm mf-qt-2.qm >/dev/null 2>/dev/null
diff --git a/gettext-tools/tests/msgfmt-xml-1 b/gettext-tools/tests/msgfmt-xml-1
index 40e956b..32003fa 100755
--- a/gettext-tools/tests/msgfmt-xml-1
+++ b/gettext-tools/tests/msgfmt-xml-1
@@ -92,16 +92,16 @@ EOF
 
 ${MSGFMT} --xml --template=mf.appdata.xml -l fr fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml fr.po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the XML file generation.
 
 ${MSGFMT} --xml --template=mf.appdata.xml -l fr fr.po -o mf.appdata.xml.out \
-  || exit 1
+  || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
@@ -111,7 +111,7 @@ test $result = 0 || exit $result
 # Test -L option.
 cp mf.appdata.xml mf.xml
 ${MSGFMT} --xml --template=mf.xml -L AppData -l fr fr.po -o mf.appdata.xml.out \
-  || exit 1
+  || Exit 1
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
 result=$?
 test $result = 0 || exit $result
diff --git a/gettext-tools/tests/msgfmt-xml-2 b/gettext-tools/tests/msgfmt-xml-2
index d10d21c..e41a6c0 100755
--- a/gettext-tools/tests/msgfmt-xml-2
+++ b/gettext-tools/tests/msgfmt-xml-2
@@ -160,13 +160,13 @@ unset LINGUAS
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 test -d po/LINGUAS || mkdir po/LINGUAS
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out \
           >/dev/null 2>/dev/null \
-  exit 1
+  Exit 1
 
 rm -fr po/LINGUAS
 
@@ -177,27 +177,27 @@ EOF
 
 ${MSGFMT} --xml --template=mf.appdata.xml -d po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out -l fr \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 ${MSGFMG} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out po/fr.po \
           >/dev/null 2>/dev/null \
-  && exit 1
+  && Exit 1
 
 # Proceed to the .desktop file generation.
 
-${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out || exit 1
+${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.out || Exit 1
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.ok mf.appdata.xml.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
 
 # Restrict the desired languages with the LINGUAS envvar.
 
-LINGUAS="fr ja" ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.desired.out || exit 1
+LINGUAS="fr ja" ${MSGFMT} --xml --template=mf.appdata.xml -d po -o mf.appdata.xml.desired.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mf.appdata.xml.desired.ok mf.appdata.xml.desired.out
-test $? = 0 || exit 1
+test $? = 0 || Exit 1
diff --git a/gettext-tools/tests/msggrep-1 b/gettext-tools/tests/msggrep-1
index 33d4181..047f262 100755
--- a/gettext-tools/tests/msggrep-1
+++ b/gettext-tools/tests/msggrep-1
@@ -153,8 +153,8 @@ msgstr "Subprozess %s hat ein fatales Signal erhalten"
 EOF
 
 : ${MSGGREP=msggrep}
-${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po || exit 1
-LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out || exit 1
+${MSGGREP} -N pipe-bidi.c -o mg-test1.tmp mg-test1.po || Exit 1
+LC_ALL=C tr -d '\r' < mg-test1.tmp > mg-test1.out || Exit 1
 
 cat <<\EOF > mg-test1.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-10 b/gettext-tools/tests/msggrep-10
index 753220b..1f50cf8 100755
--- a/gettext-tools/tests/msggrep-10
+++ b/gettext-tools/tests/msggrep-10
@@ -6,6 +6,6 @@
 # <https://savannah.gnu.org/bugs/?25437>
 
 : ${MSGGREP=msggrep}
-echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null || exit 1
+echo a=b | LC_MESSAGES=C LC_ALL= ${MSGGREP} -P -K -e '^a$' > /dev/null || Exit 1
 
 exit $result
diff --git a/gettext-tools/tests/msggrep-11 b/gettext-tools/tests/msggrep-11
index bf77675..5df1fb0 100755
--- a/gettext-tools/tests/msggrep-11
+++ b/gettext-tools/tests/msggrep-11
@@ -154,8 +154,8 @@ EOF
 
 : ${MSGGREP=msggrep}
 ${MSGGREP} --add-location=file -N pipe-bidi.c -o mg-test11.tmp mg-test11.po \
-    || exit 1
-LC_ALL=C tr -d '\r' < mg-test11.tmp > mg-test11.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < mg-test11.tmp > mg-test11.out || Exit 1
 
 cat <<\EOF > mg-test11.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-2 b/gettext-tools/tests/msggrep-2
index 62eafbc..15ad845 100755
--- a/gettext-tools/tests/msggrep-2
+++ b/gettext-tools/tests/msggrep-2
@@ -150,8 +150,8 @@ msgstr "%s: l'option 
 EOF
 
 : ${MSGGREP=msggrep}
-${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po || exit 1
-LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out || exit 1
+${MSGGREP} -M fr -o mg-test2.tmp mg-test2.po || Exit 1
+LC_ALL=C tr -d '\r' < mg-test2.tmp > mg-test2.out || Exit 1
 
 cat <<\EOF > mg-test2.ok
 domain "de"
diff --git a/gettext-tools/tests/msggrep-3 b/gettext-tools/tests/msggrep-3
index fbcbf93..86da09f 100755
--- a/gettext-tools/tests/msggrep-3
+++ b/gettext-tools/tests/msggrep-3
@@ -161,8 +161,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e error -T -e Speicher -o mg-test3.tmp mg-test3.po >mg-test3.err 2>&1
 result=$?
 cat mg-test3.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test3.tmp > mg-test3.out || Exit 1
 
 cat <<\EOF > mg-test3.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-4 b/gettext-tools/tests/msggrep-4
index b15b51a..f711d81 100755
--- a/gettext-tools/tests/msggrep-4
+++ b/gettext-tools/tests/msggrep-4
@@ -161,8 +161,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e error -f mg-test4.in1 -f mg-test4.in2 -e cannot -o mg-test4.tmp mg-test4.po > mg-test4.err 2>&1
 result=$?
 cat mg-test4.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test4.tmp > mg-test4.out || Exit 1
 
 cat <<\EOF > mg-test4.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-5 b/gettext-tools/tests/msggrep-5
index 9252f38..4f11e15 100755
--- a/gettext-tools/tests/msggrep-5
+++ b/gettext-tools/tests/msggrep-5
@@ -169,8 +169,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -C -e @proofread -o mg-test5.tmp mg-test5.po >mg-test5.err 2>&1
 result=$?
 cat mg-test5.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test5.tmp > mg-test5.out || Exit 1
 
 cat <<\EOF > mg-test5.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msggrep-6 b/gettext-tools/tests/msggrep-6
index 20b5310..c428483 100755
--- a/gettext-tools/tests/msggrep-6
+++ b/gettext-tools/tests/msggrep-6
@@ -115,8 +115,8 @@ EOF
 LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} --properties-input --properties-output -K -e error -T -e Speicher -o mg-test6.tmp mg-test6.properties
 result=$?
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test6.tmp > mg-test6.out || Exit 1
 
 cat <<\EOF > mg-test6.ok
 #: copy-file.c:60
diff --git a/gettext-tools/tests/msggrep-7 b/gettext-tools/tests/msggrep-7
index 18fcd44..82319ce 100755
--- a/gettext-tools/tests/msggrep-7
+++ b/gettext-tools/tests/msggrep-7
@@ -53,8 +53,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -J -e "File|" -o mg-test7.tmp mg-test7.po 2> mg-test7.err
 result=$?
 cat mg-test7.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test7.tmp > mg-test7.out || Exit 1
 
 cat <<\EOF > mg-test7.ok
 msgid ""
diff --git a/gettext-tools/tests/msggrep-8 b/gettext-tools/tests/msggrep-8
index 10f4457..61b8f14 100755
--- a/gettext-tools/tests/msggrep-8
+++ b/gettext-tools/tests/msggrep-8
@@ -37,8 +37,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -X -e c-form -o mg-test8.tmp mg-test8.po >mg-test8.err 2>&1
 result=$?
 cat mg-test8.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test8.tmp > mg-test8.out || Exit 1
 
 cat <<\EOF > mg-test8.ok
 msgid ""
diff --git a/gettext-tools/tests/msggrep-9 b/gettext-tools/tests/msggrep-9
index 9be93d3..207f69e 100755
--- a/gettext-tools/tests/msggrep-9
+++ b/gettext-tools/tests/msggrep-9
@@ -159,8 +159,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGGREP} -K -e 'argument$' -o mg-test9.tmp mg-test9.po > mg-test9.err 2>&1
 result=$?
 cat mg-test9.err | grep -v 'warning: Locale charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mg-test9.tmp > mg-test9.out || Exit 1
 
 cat <<\EOF > mg-test9.ok
 # German translations for GNU gettext package.
diff --git a/gettext-tools/tests/msginit-1 b/gettext-tools/tests/msginit-1
index 71754d2..fa42552 100755
--- a/gettext-tools/tests/msginit-1
+++ b/gettext-tools/tests/msginit-1
@@ -39,10 +39,10 @@ EOF
 
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test1.pot -l ga_IE --no-translator -o mi-test1.tmp 2>mi-test1.err
-test $? = 0 || { cat mi-test1.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test1.err 1>&2; Exit 1; }
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test1.tmp | LC_ALL=C tr -d '\r' > mi-test1.out || Exit 1
 
 cat <<\EOF > mi-test1.ok
 "Last-Translator: Automatically generated\n"
diff --git a/gettext-tools/tests/msginit-2 b/gettext-tools/tests/msginit-2
index bd8c5af..bd3efcd 100755
--- a/gettext-tools/tests/msginit-2
+++ b/gettext-tools/tests/msginit-2
@@ -63,8 +63,8 @@ EOF
 
 : ${MSGINIT=msginit}
 ${MSGINIT} -i mi-test2.pot -l ga_IE --no-translator -o mi-test2.tmp 2>mi-test2.err
-test $? = 0 || { cat mi-test2.err 1>&2; exit 1; }
-sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out || exit 1
+test $? = 0 || { cat mi-test2.err 1>&2; Exit 1; }
+sed -e '1,10d' < mi-test2.tmp | LC_ALL=C tr -d '\r' > mi-test2.out || Exit 1
 
 cat <<\EOF > mi-test2.ok
 "Last-Translator: Automatically generated\n"
diff --git a/gettext-tools/tests/msginit-3 b/gettext-tools/tests/msginit-3
index 923c4cf..ce971ed 100755
--- a/gettext-tools/tests/msginit-3
+++ b/gettext-tools/tests/msginit-3
@@ -38,16 +38,16 @@ EOF
 
 : ${MSGINIT=msginit}
 GETTEXTLIBDIR="$abs_top_srcdir"/src ${MSGINIT} -l ga_IE --no-translator -o mi-test3.tmp 2>mi-test3.err
-test $? = 0 || { cat mi-test3.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test3.err 1>&2; Exit 1; }
 
-grep "Project-Id-Version: gt-msginit " mi-test3.tmp 2>&1 >/dev/null || exit 1
+grep "Project-Id-Version: gt-msginit " mi-test3.tmp 2>&1 >/dev/null || Exit 1
 
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
 #
 # Project-Id-Version contains version constructed from a temporary
 # directory name
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test3.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test3.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test3.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test3.out || Exit 1
 cat <<\EOF > mi-test3.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
diff --git a/gettext-tools/tests/msginit-4 b/gettext-tools/tests/msginit-4
index 369f152..f4335f1 100755
--- a/gettext-tools/tests/msginit-4
+++ b/gettext-tools/tests/msginit-4
@@ -6,7 +6,7 @@
 LC_ALL=C "$top_builddir/src/cldr-plurals" ru /dev/null 2>&1 | grep 'extraction is not supported' > /dev/null 2>&1
 test $? = 0 && {
   echo "Skipping test: cldr-plurals was built without XML support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > mi-test4.pot
@@ -45,14 +45,14 @@ EOF
 
 : ${MSGINIT=msginit}
 GETTEXTLIBDIR="$top_builddir"/src GETTEXTCLDRDIR="$abs_srcdir" ${MSGINIT} -l foo --no-translator --no-wrap -o mi-test4.tmp 2>mi-test4.err
-test $? = 0 || { cat mi-test4.err 1>&2; exit 1; }
+test $? = 0 || { cat mi-test4.err 1>&2; Exit 1; }
 
 # The charset stored in the header entry is the locale encoding of the gl_IE
 # locale, which is system dependent, or ASCII if the locale does not exist.
 #
 # Project-Id-Version contains version constructed from a temporary
 # directory name
-sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test4.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test4.out || exit 1
+sed -e '1,10d' -e 's/\(ISO-8859-1\|CP1252\|UTF-8\)/ASCII/g' < mi-test4.tmp | grep -v Project-Id-Version | LC_ALL=C tr -d '\r' > mi-test4.out || Exit 1
 cat <<\EOF > mi-test4.ok
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
diff --git a/gettext-tools/tests/msgmerge-1 b/gettext-tools/tests/msgmerge-1
index dd1f689..141b6be 100755
--- a/gettext-tools/tests/msgmerge-1
+++ b/gettext-tools/tests/msgmerge-1
@@ -36,8 +36,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out || exit 1
+${MSGMERGE} -q -o mm-test1.tmp mm-test1.in1 mm-test1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-test1.tmp > mm-test1.out || Exit 1
 
 cat << EOF > mm-test1.ok
 # first
diff --git a/gettext-tools/tests/msgmerge-10 b/gettext-tools/tests/msgmerge-10
index eb1a429..8081346 100755
--- a/gettext-tools/tests/msgmerge-10
+++ b/gettext-tools/tests/msgmerge-10
@@ -51,8 +51,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || exit 1
+${MSGMERGE} -q -o mm-test10.tmp mm-test10.po mm-test10.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test10.tmp > mm-test10.out || Exit 1
 
 cat <<EOF > mm-test10.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-11 b/gettext-tools/tests/msgmerge-11
index bb5d757..ed49db9 100755
--- a/gettext-tools/tests/msgmerge-11
+++ b/gettext-tools/tests/msgmerge-11
@@ -53,8 +53,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || exit 1
+${MSGMERGE} -q -o mm-test11.tmp mm-test11.po mm-test11.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test11.tmp > mm-test11.out || Exit 1
 
 cat <<EOF > mm-test11.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-12 b/gettext-tools/tests/msgmerge-12
index 46c25a6..fb9f52f 100755
--- a/gettext-tools/tests/msgmerge-12
+++ b/gettext-tools/tests/msgmerge-12
@@ -51,8 +51,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || exit 1
+${MSGMERGE} -q -o mm-test12.tmp mm-test12.po mm-test12.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test12.tmp > mm-test12.out || Exit 1
 
 cat <<EOF > mm-test12.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-13 b/gettext-tools/tests/msgmerge-13
index 2887698..4eb9a4d 100755
--- a/gettext-tools/tests/msgmerge-13
+++ b/gettext-tools/tests/msgmerge-13
@@ -84,8 +84,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || exit 1
+${MSGMERGE} -q -o mm-test13.tmp mm-test13.po mm-test13.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test13.tmp > mm-test13.out || Exit 1
 
 cat <<EOF > mm-test13.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-14 b/gettext-tools/tests/msgmerge-14
index 7c15d2f..1514d8e 100755
--- a/gettext-tools/tests/msgmerge-14
+++ b/gettext-tools/tests/msgmerge-14
@@ -55,8 +55,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out || exit 1
+${MSGMERGE} -q -o mm-test14.tmp mm-test14-ru.po mm-test14.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test14.tmp > mm-test14.out || Exit 1
 
 cat <<\EOF > mm-test14.ok
 # Russian messages for CLISP
diff --git a/gettext-tools/tests/msgmerge-15 b/gettext-tools/tests/msgmerge-15
index a7a80aa..30dca36 100755
--- a/gettext-tools/tests/msgmerge-15
+++ b/gettext-tools/tests/msgmerge-15
@@ -27,8 +27,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || exit 1
+${MSGMERGE} -q -o mm-test15.tmp mm-test15.pot mm-test15.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test15.tmp > mm-test15.out || Exit 1
 
 cat <<\EOF > mm-test15.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-16 b/gettext-tools/tests/msgmerge-16
index ed726c2..cbff312 100755
--- a/gettext-tools/tests/msgmerge-16
+++ b/gettext-tools/tests/msgmerge-16
@@ -57,8 +57,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po || exit 1
+${MSGMERGE} -q -o mm-test16.tmp.po mm-test16.po mm-test16.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test16.tmp.po > mm-test16.new.po || Exit 1
 
 cat <<\EOF > mm-test16.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-17 b/gettext-tools/tests/msgmerge-17
index 7342061..6b64fcd 100755
--- a/gettext-tools/tests/msgmerge-17
+++ b/gettext-tools/tests/msgmerge-17
@@ -51,8 +51,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || exit 1
+${MSGMERGE} -q -o mm-test17.tmp.po mm-test17.po mm-test17.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test17.tmp.po > mm-test17.new.po || Exit 1
 
 cat <<\EOF > mm-test17.ok
 # Irish translations.
diff --git a/gettext-tools/tests/msgmerge-18 b/gettext-tools/tests/msgmerge-18
index 6037379..ef0f6d6 100755
--- a/gettext-tools/tests/msgmerge-18
+++ b/gettext-tools/tests/msgmerge-18
@@ -114,11 +114,11 @@ EOF
 
 : ${MSGCMP=msgcmp}
 ${MSGCMP} --use-fuzzy --use-untranslated mm-test18.po mm-test18.pot 2>/dev/null
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || exit 1
+${MSGMERGE} -q -o mm-test18.tmp.po mm-test18.po mm-test18.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test18.tmp.po > mm-test18.new.po || Exit 1
 
 # Note that the fuzzy guess for "Open" in context "Door state" could be either
 # "Ouvrir" (from context "File|") or "Ouvert" (from context "Lock state").
@@ -186,9 +186,9 @@ msgstr "photocopieur"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test18.ok mm-test18.new.po || exit 1
+${DIFF} mm-test18.ok mm-test18.new.po || Exit 1
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test18.new.po mm-test18.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-19 b/gettext-tools/tests/msgmerge-19
index 740b7ae..9f54dc1 100755
--- a/gettext-tools/tests/msgmerge-19
+++ b/gettext-tools/tests/msgmerge-19
@@ -77,8 +77,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || exit 1
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.po mm-test19.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new1.po || Exit 1
 
 cat <<\EOF > mm-test19.ok1
 msgid ""
@@ -120,7 +120,7 @@ msgstr "%s: ungültige Option -- %c\n"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok1 mm-test19.new1.po || exit 1
+${DIFF} mm-test19.ok1 mm-test19.new1.po || Exit 1
 
 cat <<\EOF > mm-test19.pot
 # SOME DESCRIPTIVE TITLE.
@@ -161,8 +161,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || exit 1
+${MSGMERGE} -q --previous -o mm-test19.tmp.po mm-test19.new1.po mm-test19.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test19.tmp.po > mm-test19.new2.po || Exit 1
 
 cat <<\EOF > mm-test19.ok2
 msgid ""
@@ -203,6 +203,6 @@ msgstr "Argumente fehlen"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test19.ok2 mm-test19.new2.po || exit 1
+${DIFF} mm-test19.ok2 mm-test19.new2.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-20 b/gettext-tools/tests/msgmerge-20
index f752fd9..5985fa8 100755
--- a/gettext-tools/tests/msgmerge-20
+++ b/gettext-tools/tests/msgmerge-20
@@ -72,8 +72,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || exit 1
+${MSGMERGE} -q -o mm-test20.tmp.po mm-test20.po mm-test20.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test20.tmp.po > mm-test20.new.po || Exit 1
 
 cat <<\EOF > mm-test20.ok
 msgid ""
@@ -109,6 +109,6 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test20.ok mm-test20.new.po || exit 1
+${DIFF} mm-test20.ok mm-test20.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-21 b/gettext-tools/tests/msgmerge-21
index 6e1c6f5..d3c014b 100755
--- a/gettext-tools/tests/msgmerge-21
+++ b/gettext-tools/tests/msgmerge-21
@@ -46,8 +46,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po || exit 1
+${MSGMERGE} -q -o mm-test21.tmp.po mm-test21.po mm-test21.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test21.tmp.po > mm-test21.new.po || Exit 1
 
 cat <<\EOF > mm-test21.ok
 msgid ""
@@ -72,9 +72,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test21.ok mm-test21.new.po || exit 1
+${DIFF} mm-test21.ok mm-test21.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || exit 1
+${MSGFMT} --check -o mm-test21.mo mm-test21.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-22 b/gettext-tools/tests/msgmerge-22
index b0882d7..ffda11d 100755
--- a/gettext-tools/tests/msgmerge-22
+++ b/gettext-tools/tests/msgmerge-22
@@ -44,8 +44,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po || exit 1
+${MSGMERGE} -q -o mm-test22.tmp.po mm-test22.po mm-test22.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test22.tmp.po > mm-test22.new.po || Exit 1
 
 cat <<\EOF > mm-test22.ok
 msgid ""
@@ -70,9 +70,9 @@ msgstr[1] "Engadir %n recursos dende o libro de enderezos"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test22.ok mm-test22.new.po || exit 1
+${DIFF} mm-test22.ok mm-test22.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || exit 1
+${MSGFMT} --check -o mm-test22.mo mm-test22.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-23 b/gettext-tools/tests/msgmerge-23
index 757e190..125cdfe 100755
--- a/gettext-tools/tests/msgmerge-23
+++ b/gettext-tools/tests/msgmerge-23
@@ -77,8 +77,8 @@ msgstr[1] ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po || exit 1
+${MSGMERGE} -q --previous -o mm-test23.tmp.po mm-test23.po mm-test23.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test23.tmp.po > mm-test23.new.po || Exit 1
 
 cat <<\EOF > mm-test23.ok
 msgid ""
@@ -120,9 +120,9 @@ msgstr[1] "%n Bände"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test23.ok mm-test23.new.po || exit 1
+${DIFF} mm-test23.ok mm-test23.new.po || Exit 1
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || exit 1
+${MSGFMT} --check -o mm-test23.mo mm-test23.new.po || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-24 b/gettext-tools/tests/msgmerge-24
index a919147..42b6d6f 100755
--- a/gettext-tools/tests/msgmerge-24
+++ b/gettext-tools/tests/msgmerge-24
@@ -102,11 +102,11 @@ msgstr[1] ""
 EOF
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test24.po mm-test24.pot 2>/dev/null || Exit 1
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po || exit 1
+${MSGMERGE} -q -o mm-test24.tmp.po mm-test24.po mm-test24.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test24.tmp.po > mm-test24.new.po || Exit 1
 
 cat <<\EOF > mm-test24.ok
 msgid ""
@@ -153,9 +153,9 @@ msgstr[1] "cinq semaines et %d jours"
 EOF
 
 : ${DIFF=diff}
-${DIFF} mm-test24.ok mm-test24.new.po || exit 1
+${DIFF} mm-test24.ok mm-test24.new.po || Exit 1
 
 : ${MSGCMP=msgcmp}
-${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot || exit 1
+${MSGCMP} --use-fuzzy --use-untranslated mm-test24.new.po mm-test24.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-25 b/gettext-tools/tests/msgmerge-25
index d0f2d2c..af76b48 100755
--- a/gettext-tools/tests/msgmerge-25
+++ b/gettext-tools/tests/msgmerge-25
@@ -37,8 +37,8 @@ EOF
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} --add-location=file -q -o mm-test25.tmp mm-test25.in1 mm-test25.in2 \
-    || exit 1
-LC_ALL=C tr -d '\r' < mm-test25.tmp > mm-test25.out || exit 1
+    || Exit 1
+LC_ALL=C tr -d '\r' < mm-test25.tmp > mm-test25.out || Exit 1
 
 cat << EOF > mm-test25.ok
 # first
diff --git a/gettext-tools/tests/msgmerge-3 b/gettext-tools/tests/msgmerge-3
index b03d47e..3c092ed 100755
--- a/gettext-tools/tests/msgmerge-3
+++ b/gettext-tools/tests/msgmerge-3
@@ -50,8 +50,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out || exit 1
+${MSGMERGE} -q -o mm-test3.tmp mm-test3.in1 mm-test3.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-test3.tmp > mm-test3.out || Exit 1
 
 cat << EOF > mm-test3.ok
 #: file3:102
diff --git a/gettext-tools/tests/msgmerge-4 b/gettext-tools/tests/msgmerge-4
index df23377..423ea08 100755
--- a/gettext-tools/tests/msgmerge-4
+++ b/gettext-tools/tests/msgmerge-4
@@ -25,8 +25,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || exit 1
+${MSGMERGE} -q -o mm-test4.tmp mm-test4.in1.po mm-test4.in2.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test4.tmp > mm-test4.out || Exit 1
 
 cat <<EOF > mm-test4.ok
 msgid "one"
diff --git a/gettext-tools/tests/msgmerge-5 b/gettext-tools/tests/msgmerge-5
index db90c6f..0b25be2 100755
--- a/gettext-tools/tests/msgmerge-5
+++ b/gettext-tools/tests/msgmerge-5
@@ -41,8 +41,8 @@ LC_MESSAGES=C LC_ALL= \
 ${MSGMERGE} -q -o mm-test5.tmp mm-test5.in1.po mm-test5.in2.po >mm-test5.err 2>&1
 result=$?
 cat mm-test5.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || exit 1
+test $result = 0 || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-test5.tmp > mm-test5.out || Exit 1
 
 cat <<EOF > mm-test5.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-6 b/gettext-tools/tests/msgmerge-6
index 1d07320..9b66bc7 100755
--- a/gettext-tools/tests/msgmerge-6
+++ b/gettext-tools/tests/msgmerge-6
@@ -55,8 +55,8 @@ EOF
 
 : ${MSGMERGE=msgmerge}
 LC_MESSAGES=C LC_ALL= \
-${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po || exit 1
-LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out || exit 1
+${MSGMERGE} -q -o mm-test6.tmp mm-test6.in1.po mm-test6.in2.po || Exit 1
+LC_ALL=C tr -d '\r' < mm-test6.tmp > mm-test6.out || Exit 1
 
 cat <<\EOF > mm-test6.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-7 b/gettext-tools/tests/msgmerge-7
index de33984..cdc7542 100755
--- a/gettext-tools/tests/msgmerge-7
+++ b/gettext-tools/tests/msgmerge-7
@@ -39,8 +39,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || exit 1
+${MSGMERGE} -q -o mm-test7.tmp mm-test7.po mm-test7.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test7.tmp > mm-test7.out || Exit 1
 
 cat <<\EOF > mm-test7.ok
 domain "foo-de"
diff --git a/gettext-tools/tests/msgmerge-8 b/gettext-tools/tests/msgmerge-8
index 32a8373..c5fb4dc 100755
--- a/gettext-tools/tests/msgmerge-8
+++ b/gettext-tools/tests/msgmerge-8
@@ -35,8 +35,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out || exit 1
+${MSGMERGE} --multi-domain -q -o mm-test8.tmp mm-test8.po mm-test8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-test8.tmp > mm-test8.out || Exit 1
 
 cat <<\EOF > mm-test8.ok
 domain "foo-de"
diff --git a/gettext-tools/tests/msgmerge-compendium-1 b/gettext-tools/tests/msgmerge-compendium-1
index 449a1b8..3d4e008 100755
--- a/gettext-tools/tests/msgmerge-compendium-1
+++ b/gettext-tools/tests/msgmerge-compendium-1
@@ -26,8 +26,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out || exit 1
+${MSGMERGE} -q -C mm-c-1.com -o mm-c-1.tmp mm-c-1.in1 mm-c-1.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-1.tmp > mm-c-1.out || Exit 1
 
 cat << EOF > mm-c-1.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-2 b/gettext-tools/tests/msgmerge-compendium-2
index cace4b6..650075c 100755
--- a/gettext-tools/tests/msgmerge-compendium-2
+++ b/gettext-tools/tests/msgmerge-compendium-2
@@ -26,8 +26,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out || exit 1
+${MSGMERGE} -q -C mm-c-2.com -o mm-c-2.tmp mm-c-2.in1 mm-c-2.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-2.tmp > mm-c-2.out || Exit 1
 
 cat << EOF > mm-c-2.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-3 b/gettext-tools/tests/msgmerge-compendium-3
index d209305..ce4e543 100755
--- a/gettext-tools/tests/msgmerge-compendium-3
+++ b/gettext-tools/tests/msgmerge-compendium-3
@@ -34,8 +34,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out || exit 1
+${MSGMERGE} -q -C mm-c-3.com -o mm-c-3.tmp mm-c-3.in1 mm-c-3.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-3.tmp > mm-c-3.out || Exit 1
 
 cat << EOF > mm-c-3.ok
 #: file.c:123
diff --git a/gettext-tools/tests/msgmerge-compendium-4 b/gettext-tools/tests/msgmerge-compendium-4
index a831624..050664e 100755
--- a/gettext-tools/tests/msgmerge-compendium-4
+++ b/gettext-tools/tests/msgmerge-compendium-4
@@ -27,8 +27,8 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out || exit 1
+${MSGMERGE} -q --compendium mm-c-4.com -o mm-c-4.tmp /dev/null mm-c-4.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-4.tmp > mm-c-4.out || Exit 1
 
 cat << \EOF > mm-c-4.ok
 msgid ""
diff --git a/gettext-tools/tests/msgmerge-compendium-5 b/gettext-tools/tests/msgmerge-compendium-5
index eb80ed4..5c28dd1 100755
--- a/gettext-tools/tests/msgmerge-compendium-5
+++ b/gettext-tools/tests/msgmerge-compendium-5
@@ -6,8 +6,8 @@
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-5.tmp \
   --compendium "$abs_srcdir"/mm-viet.comp.po \
-  /dev/null "$abs_srcdir"/mm-viet.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || exit 1
+  /dev/null "$abs_srcdir"/mm-viet.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-5.tmp > mm-c-5.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/mm-viet.out mm-c-5.out
diff --git a/gettext-tools/tests/msgmerge-compendium-6 b/gettext-tools/tests/msgmerge-compendium-6
index dd04119..d5e7731 100755
--- a/gettext-tools/tests/msgmerge-compendium-6
+++ b/gettext-tools/tests/msgmerge-compendium-6
@@ -19,63 +19,63 @@ ${MSGCONV} --to-code=UTF-8 -o mm-ko-comp.utf-8.po "$abs_srcdir"/mm-ko-comp.euc-k
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AEE.tmp > mm-c-6-AEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AEU.tmp > mm-c-6-AEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || exit 1
+  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AUE.tmp > mm-c-6-AUE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-AUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || exit 1
+  mm-ko.utf-8.po "$abs_srcdir"/mm-ko.ascii.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-AUU.tmp > mm-c-6-AUU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UEE.tmp > mm-c-6-UEE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UEU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || exit 1
+  "$abs_srcdir"/mm-ko.euc-kr.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UEU.tmp > mm-c-6-UEU.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUE.tmp \
   --compendium "$abs_srcdir"/mm-ko-comp.euc-kr.po \
-  mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || exit 1
+  mm-ko.utf-8.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UUE.tmp > mm-c-6-UUE.out || Exit 1
 
 : ${MSGMERGE=msgmerge}
 ${MSGMERGE} -q -o mm-c-6-UUU.tmp \
   --compendium mm-ko-comp.utf-8.po \
-  mm-ko.utf-8.po mm-ko.utf-8.pot || exit 1
-LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || exit 1
+  mm-ko.utf-8.po mm-ko.utf-8.pot || Exit 1
+LC_ALL=C tr -d '\r' < mm-c-6-UUU.tmp > mm-c-6-UUU.out || Exit 1
 
 : ${MSGCONV=msgconv}
 ${MSGCONV} --to-code=UTF-8 mm-c-6-UUU.out | LC_ALL=C tr -d '\r' > mm-c-6-U.ok
 ${MSGCONV} --to-code=EUC-KR mm-c-6-UUU.out | LC_ALL=C sed -e 's,EUC-KR,euc-kr,' | LC_ALL=C tr -d '\r' > mm-c-6-E.ok
 
 : ${DIFF=diff}
-${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { exit 1; }
-${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { exit 1; }
-${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { exit 1; }
+${DIFF} mm-c-6-E.ok mm-c-6-AEE.out || { Exit 1; }
+${DIFF} mm-c-6-E.ok mm-c-6-AEU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-AUU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UEU.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUE.out || { Exit 1; }
+${DIFF} mm-c-6-U.ok mm-c-6-UUU.out || { Exit 1; }
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgmerge-properties-1 b/gettext-tools/tests/msgmerge-properties-1
index ff7c968..f7554b6 100755
--- a/gettext-tools/tests/msgmerge-properties-1
+++ b/gettext-tools/tests/msgmerge-properties-1
@@ -35,8 +35,8 @@ still\ existing=here is normally no comment
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 || exit 1
-LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out || exit 1
+${MSGMERGE} -q --properties-input --properties-output -o mm-p-1.tmp mm-p-1.in1 mm-p-1.in2 || Exit 1
+LC_ALL=C tr -d '\r' < mm-p-1.tmp > mm-p-1.out || Exit 1
 
 cat << EOF > mm-p-1.ok
 #: file3:102
diff --git a/gettext-tools/tests/msgmerge-properties-2 b/gettext-tools/tests/msgmerge-properties-2
index aace912..595f0eb 100755
--- a/gettext-tools/tests/msgmerge-properties-2
+++ b/gettext-tools/tests/msgmerge-properties-2
@@ -16,9 +16,9 @@ cat <<EOF > mm-p-2.pot
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot || exit 1
-mv mm-p-2.po mm-p-2.tmp || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po || exit 1
+${MSGMERGE} -q --properties-input --update mm-p-2.po mm-p-2.pot || Exit 1
+mv mm-p-2.po mm-p-2.tmp || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-p-2.tmp > mm-p-2.po || Exit 1
 
 cat <<\EOF > mm-p-2.ok
 #. location changed
diff --git a/gettext-tools/tests/msgmerge-update-1 b/gettext-tools/tests/msgmerge-update-1
index 4a77882..11f072a 100755
--- a/gettext-tools/tests/msgmerge-update-1
+++ b/gettext-tools/tests/msgmerge-update-1
@@ -59,7 +59,7 @@ EOF
 cp mm-u-1.po mm-u-1.bak
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot || exit 1
+${MSGMERGE} -q --update mm-u-1.po mm-u-1.pot || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mm-u-1.bak mm-u-1.po
diff --git a/gettext-tools/tests/msgmerge-update-2 b/gettext-tools/tests/msgmerge-update-2
index 4f651ca..0c499c4 100755
--- a/gettext-tools/tests/msgmerge-update-2
+++ b/gettext-tools/tests/msgmerge-update-2
@@ -49,9 +49,9 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot || exit 1
-mv mm-u-2.po mm-u-2.tmp || { exit 1; }
-LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po || exit 1
+${MSGMERGE} -q --update mm-u-2.po mm-u-2.pot || Exit 1
+mv mm-u-2.po mm-u-2.tmp || { Exit 1; }
+LC_ALL=C tr -d '\r' < mm-u-2.tmp > mm-u-2.po || Exit 1
 
 cat <<\EOF > mm-u-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-update-3 b/gettext-tools/tests/msgmerge-update-3
index 7f45a45..a77606e 100755
--- a/gettext-tools/tests/msgmerge-update-3
+++ b/gettext-tools/tests/msgmerge-update-3
@@ -49,7 +49,7 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot || exit 1
+${MSGMERGE} -q --update mm-u-3.po mm-u-3.pot || Exit 1
 
 cat <<\EOF > mm-u-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgmerge-update-4 b/gettext-tools/tests/msgmerge-update-4
index e76974b..8c4ea69 100755
--- a/gettext-tools/tests/msgmerge-update-4
+++ b/gettext-tools/tests/msgmerge-update-4
@@ -52,7 +52,7 @@ msgstr ""
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot || exit 1
+${MSGMERGE} -q --update --sort-output mm-u-4.po mm-u-4.pot || Exit 1
 
 cat <<\EOF > mm-u-4.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/msgunfmt-1 b/gettext-tools/tests/msgunfmt-1
index ccde087..76aa6ac 100755
--- a/gettext-tools/tests/msgunfmt-1
+++ b/gettext-tools/tests/msgunfmt-1
@@ -30,11 +30,11 @@ msgstr "second"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-test1.mo mu-test1.in || exit 1
+${MSGFMT} -o mu-test1.mo mu-test1.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-test1.tmp mu-test1.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out || exit 1
+${MSGUNFMT} -o mu-test1.tmp mu-test1.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-test1.tmp > mu-test1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-test1.in mu-test1.out
diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2
index 6bbac97..496e931 100755
--- a/gettext-tools/tests/msgunfmt-2
+++ b/gettext-tools/tests/msgunfmt-2
@@ -13,11 +13,11 @@ msgstr "schneide bei %<PRIuMAX> Bytes in Ausgabedatei %s ab"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o mu-2.mo mu-2.in || exit 1
+${MSGFMT} -o mu-2.mo mu-2.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o mu-2.tmp mu-2.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out || exit 1
+${MSGUNFMT} -o mu-2.tmp mu-2.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-2.tmp > mu-2.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-2.in mu-2.out
diff --git a/gettext-tools/tests/msgunfmt-3 b/gettext-tools/tests/msgunfmt-3
index ce54a8f..42dc1cc 100755
--- a/gettext-tools/tests/msgunfmt-3
+++ b/gettext-tools/tests/msgunfmt-3
@@ -7,6 +7,6 @@
 
 for n in 1 2 3 4 5 6; do
   LANGUAGE= LC_ALL=C ${MSGUNFMT} "$abs_srcdir"/overflow-$n.mo 2>mu-3.err >/dev/null
-  test $? != 0 || exit 1
-  grep ' is truncated' mu-3.err >/dev/null || exit 1
+  test $? != 0 || Exit 1
+  grep ' is truncated' mu-3.err >/dev/null || Exit 1
 done
diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 34c1141..fbbd5cc 100755
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -6,15 +6,15 @@
 # Test whether we can compile and execute C# programs.
 test "${CSHARP_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-csharp"
-  exit 77
+  Exit 77
 }
 test "${BUILDCSHARP}" = yes || {
   echo "Skipping test: C# compiler not found"
-  exit 77
+  Exit 77
 }
 test "${TESTCSHARP}" = yes || {
   echo "Skipping test: C# engine not found"
-  exit 77
+  Exit 77
 }
 
 test -d mu-cs-1 || mkdir mu-cs-1
@@ -52,15 +52,15 @@ EOF
 
 : ${MSGFMT=msgfmt}
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || exit 1
+${MSGFMT} --csharp -d mu-cs-1 -r prog -l fr mu-cs-1/fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 GETTEXTCSHARPEXEDIR=../../src \
 GETTEXTCSHARPLIBDIR=../../../gettext-runtime/intl-csharp \
-${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || exit 1
+${MSGUNFMT} --csharp -d mu-cs-1 -r prog -l fr -o mu-cs-1/prog.out || Exit 1
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-cs-1/prog.sort mu-cs-1/prog.out || exit 1
+${MSGCAT} -s -o mu-cs-1/prog.sort mu-cs-1/prog.out || Exit 1
 
 cat <<\EOF > mu-cs-1/prog.ok
 msgid ""
@@ -87,6 +87,6 @@ msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || exit 1
+${DIFF} mu-cs-1/prog.ok mu-cs-1/prog.sort || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index 8857eb1..3b807f0 100755
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -9,15 +9,15 @@
 # Test whether we can compile and execute Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
-  exit 77
+  Exit 77
 }
 test "${BUILDJAVA}" = yes || {
   echo "Skipping test: Java compiler or jar not found"
-  exit 77
+  Exit 77
 }
 test "${TESTJAVA}" = yes || {
   echo "Skipping test: Java engine not found"
-  exit 77
+  Exit 77
 }
 
 test -d mu-java-1 || mkdir mu-java-1
@@ -54,15 +54,15 @@ msgstr "Fermer"
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || exit 1
+${MSGFMT} -j -d mu-java-1 -r prog -l fr mu-java-1/fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 CLASSPATH=mu-java-1${CLASSPATH:+:$CLASSPATH} \
 GETTEXTJEXEDIR=../../src GETTEXTJAR=../../src/gettext.jar \
-${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || exit 1
+${MSGUNFMT} --java -d mu-java-1 -r prog -l fr -o mu-java-1/prog.out || Exit 1
 
 : ${MSGCAT=msgcat}
-${MSGCAT} -s -o mu-java-1/prog.sort mu-java-1/prog.out || exit 1
+${MSGCAT} -s -o mu-java-1/prog.sort mu-java-1/prog.out || Exit 1
 
 cat <<\EOF > mu-java-1/prog.ok
 msgid ""
@@ -89,6 +89,6 @@ msgid "{0} is replaced by {1}."
 msgstr "{1} remplace {0}."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || exit 1
+${DIFF} mu-java-1/prog.ok mu-java-1/prog.sort || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msgunfmt-properties-1 b/gettext-tools/tests/msgunfmt-properties-1
index 41fd811..2184dbd 100755
--- a/gettext-tools/tests/msgunfmt-properties-1
+++ b/gettext-tools/tests/msgunfmt-properties-1
@@ -22,11 +22,11 @@ two=second
 EOF
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in || exit 1
+${MSGFMT} --properties-input -o mu-p-1.mo mu-p-1.in || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo || exit 1
-LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out || exit 1
+${MSGUNFMT} --properties-output -o mu-p-1.tmp mu-p-1.mo || Exit 1
+LC_ALL=C tr -d '\r' < mu-p-1.tmp > mu-p-1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} mu-p-1.in mu-p-1.out
diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index ab493d7..6a2d2e0 100755
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -18,7 +18,7 @@ puts $tcl_version
 EOF
 (tclsh mu-tcl-1-version.tcl) >/dev/null 2>/dev/null \
   || { echo "Skipping test: tclsh not found or Tcl too old"
-       exit 77
+       Exit 77
      }
 
 cat <<\EOF > mu-tcl-1-fr.po
@@ -39,11 +39,11 @@ EOF
 test -d mu-tcl-1-msgs || mkdir mu-tcl-1-msgs
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || exit 1
+${MSGFMT} --tcl -d mu-tcl-1-msgs -l fr mu-tcl-1-fr.po || Exit 1
 
 : ${MSGUNFMT=msgunfmt}
 GETTEXTDATADIR="$abs_top_srcdir"/src \
-${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || exit 1
+${MSGUNFMT} --tcl -d mu-tcl-1-msgs -l fr -o mu-tcl-1-prog.out || Exit 1
 
 cat <<\EOF > mu-tcl-1-prog.ok
 msgid ""
@@ -56,6 +56,6 @@ msgid "%s is replaced by %s."
 msgstr "%2$s remplace %1$s."
 EOF
 : ${DIFF=diff}
-${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || exit 1
+${DIFF} mu-tcl-1-prog.ok mu-tcl-1-prog.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/msguniq-1 b/gettext-tools/tests/msguniq-1
index 326e48e..b96238e 100755
--- a/gettext-tools/tests/msguniq-1
+++ b/gettext-tools/tests/msguniq-1
@@ -4,8 +4,8 @@
 # Test general operation.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || exit 1
+${MSGUNIQ} -w 1000 -o msguniq-1.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-1.tmp > msguniq-1.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/msguniq-a.out msguniq-1.out
diff --git a/gettext-tools/tests/msguniq-2 b/gettext-tools/tests/msguniq-2
index f5e77f9..234274a 100755
--- a/gettext-tools/tests/msguniq-2
+++ b/gettext-tools/tests/msguniq-2
@@ -4,8 +4,8 @@
 # Test --unique option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || exit 1
+${MSGUNIQ} -w 1000 -u -o msguniq-2.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-2.tmp > msguniq-2.out || Exit 1
 
 cat <<\EOF > msguniq-2.ok
 # Template messages for CLISP
diff --git a/gettext-tools/tests/msguniq-3 b/gettext-tools/tests/msguniq-3
index 672e0c3..0949d9d 100755
--- a/gettext-tools/tests/msguniq-3
+++ b/gettext-tools/tests/msguniq-3
@@ -4,8 +4,8 @@
 # Test --repeated option.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || exit 1
+${MSGUNIQ} -w 1000 -d -o msguniq-3.tmp "$abs_srcdir"/msguniq-a.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-3.tmp > msguniq-3.out || Exit 1
 
 cat <<\EOF > msguniq-3.ok
 # Template messages for CLISP
diff --git a/gettext-tools/tests/msguniq-4 b/gettext-tools/tests/msguniq-4
index 89e1279..e4e5e48 100755
--- a/gettext-tools/tests/msguniq-4
+++ b/gettext-tools/tests/msguniq-4
@@ -4,10 +4,10 @@
 # Test general operation with Java .properties syntax.
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || exit 1
+${MSGUNIQ} --properties-input --properties-output -w 1000 -o msguniq-4.out "$abs_srcdir"/msguniq-a.inp || Exit 1
 
 : ${MSGCAT-msgcat}
-${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || exit 1
+${MSGCAT} --properties-output -w 1000 -o msguniq-4.ok "$abs_srcdir"/msguniq-a.out || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} msguniq-4.ok msguniq-4.out
diff --git a/gettext-tools/tests/msguniq-5 b/gettext-tools/tests/msguniq-5
index 530efab..a73aecb 100755
--- a/gettext-tools/tests/msguniq-5
+++ b/gettext-tools/tests/msguniq-5
@@ -54,8 +54,8 @@ msgstr "photocopieur"
 EOF
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po || exit 1
-LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out || exit 1
+${MSGUNIQ} -o msguniq-5.tmp msguniq-5.po || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-5.tmp > msguniq-5.out || Exit 1
 
 cat <<\EOF > msguniq-5.ok
 msgid ""
diff --git a/gettext-tools/tests/msguniq-6 b/gettext-tools/tests/msguniq-6
index 51a1220..36d5027 100755
--- a/gettext-tools/tests/msguniq-6
+++ b/gettext-tools/tests/msguniq-6
@@ -67,8 +67,8 @@ msgstr "%s: Option erwartet ein Argument -- %c\n"
 EOF
 
 : ${MSGUNIQ=msguniq}
-${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out || exit 1
+${MSGUNIQ} -o msguniq-6.tmp msguniq-6.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-6.tmp > msguniq-6.out || Exit 1
 
 cat <<\EOF > msguniq-6.ok
 msgid ""
diff --git a/gettext-tools/tests/msguniq-7 b/gettext-tools/tests/msguniq-7
index 5cae2e9..a866270 100755
--- a/gettext-tools/tests/msguniq-7
+++ b/gettext-tools/tests/msguniq-7
@@ -14,8 +14,8 @@ msgstr ""
 EOF
 
 : ${MSGUNIQ-msguniq}
-${MSGUNIQ} --add-location=file -o msguniq-7.tmp msguniq-7.in || exit 1
-LC_ALL=C tr -d '\r' < msguniq-7.tmp > msguniq-7.out || exit 1
+${MSGUNIQ} --add-location=file -o msguniq-7.tmp msguniq-7.in || Exit 1
+LC_ALL=C tr -d '\r' < msguniq-7.tmp > msguniq-7.out || Exit 1
 
 cat <<\EOF > msguniq-7.ok
 #: foo bar
diff --git a/gettext-tools/tests/plural-1 b/gettext-tools/tests/plural-1
index 198283a..66dd10b 100755
--- a/gettext-tools/tests/plural-1
+++ b/gettext-tools/tests/plural-1
@@ -2,8 +2,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || exit 1
+${XGETTEXT} -o plural-1-cake.tmp --omit-header --no-location "$abs_srcdir"/plural-1-prg.c || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > plural-1-cake.pot || Exit 1
 
 cat <<EOF > plural-1-cake.ok
 #, c-format
@@ -14,7 +14,7 @@ msgstr[1] ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} plural-1-cake.ok plural-1-cake.pot || exit 1
+${DIFF} plural-1-cake.ok plural-1-cake.pot || Exit 1
 
 cat <<EOF > plural-1-fr.po
 # Les gateaux allemands sont les meilleurs du monde.
@@ -26,11 +26,11 @@ msgstr[1] "%d morceaux de gateau"
 EOF
 
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot || exit 1
-LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new || exit 1
+${MSGMERGE} -q -o plural-1-fr.po.tmp plural-1-fr.po plural-1-cake.pot || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.new || Exit 1
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po plural-1-fr.po.new || exit 1
+${DIFF} plural-1-fr.po plural-1-fr.po.new || Exit 1
 
 test -d plural-1-dir || mkdir plural-1-dir
 test -d plural-1-dir/fr || mkdir plural-1-dir/fr
@@ -40,26 +40,26 @@ test -d plural-1-dir/fr/LC_MESSAGES || mkdir plural-1-dir/fr/LC_MESSAGES
 ${MSGFMT} -o plural-1-dir/fr/LC_MESSAGES/cake.mo plural-1-fr.po
 
 : ${MSGUNFMT=msgunfmt}
-${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo || exit 1
-LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un || exit 1
+${MSGUNFMT} -o plural-1-fr.po.tmp plural-1-dir/fr/LC_MESSAGES/cake.mo || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-fr.po.tmp > plural-1-fr.po.un || Exit 1
 
 sed 1,2d < plural-1-fr.po > plural-1-fr.po.strip
 
 : ${DIFF=diff}
-${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || exit 1
+${DIFF} plural-1-fr.po.strip plural-1-fr.po.un || Exit 1
 
 : ${DIFF=diff}
 echo 'un morceau de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 1 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 echo '2 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 2 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 echo '10 morceaux de gateau' > plural-1-cake.ok
-LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || exit 1
-LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || exit 1
-${DIFF} plural-1-cake.ok cake.out || exit 1
+LANGUAGE= ../cake fr 10 > plural-1-cake.tmp || Exit 1
+LC_ALL=C tr -d '\r' < plural-1-cake.tmp > cake.out || Exit 1
+${DIFF} plural-1-cake.ok cake.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/plural-2 b/gettext-tools/tests/plural-2
index 4116263..983f207 100755
--- a/gettext-tools/tests/plural-2
+++ b/gettext-tools/tests/plural-2
@@ -65,7 +65,7 @@ msgstr[7] "7"
 msgstr[8] "8"
 msgstr[9] "9"
 EOF
-  ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || exit 1
+  ${MSGFMT} -o plural-2-dir/ll/LC_MESSAGES/plural.mo plural-2-ll.po || Exit 1
   (for i in '' 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
      LANGUAGE= TEXTDOMAIN=plural TEXTDOMAINDIR=plural-2-dir \
        $NGETTEXT --env LC_ALL=ll X Y ${i}0 ${i}1 ${i}2 ${i}3 ${i}4 ${i}5 ${i}6 ${i}7 ${i}8 ${i}9
@@ -75,8 +75,8 @@ EOF
     echo "plural=${formula}" 1>&2
     echo "Expected: $dataok" 1>&2
     echo "Got:      "`cat dataout` 1>&2
-    exit 1
+    Exit 1
   }
 done < plural-2.data
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1
index af74893..9bdd912 100755
--- a/gettext-tools/tests/recode-sr-latin-1
+++ b/gettext-tools/tests/recode-sr-latin-1
@@ -10,7 +10,7 @@ if test $LOCALE_FR_UTF8 != none; then
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
-    *) exit 1;;
+    *) Exit 1;;
   esac
 fi
 if test $LOCALE_FR_UTF8 = none; then
@@ -19,7 +19,7 @@ if test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french UTF-8 locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 cat <<\EOF > rec-srl-1.in
@@ -34,7 +34,7 @@ EOF
 : ${RECODE=recode}
 LC_ALL=$LOCALE_FR_UTF8 \
 ${RECODE}-sr-latin < rec-srl-1.in > rec-srl-1.out \
-  || { exit 1; }
+  || { Exit 1; }
 
 cat <<\EOF > rec-srl-1.ok
 Ispravni argumenti su
diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2
index 7f13bd5..61aa233 100755
--- a/gettext-tools/tests/recode-sr-latin-2
+++ b/gettext-tools/tests/recode-sr-latin-2
@@ -16,7 +16,7 @@ if test $LOCALE_JA = none; then
   else
     echo "Skipping test: no japanese EUC-JP locale is supported"
   fi
-  exit 77
+  Exit 77
 fi
 
 cat <<\EOF > rec-srl-2.in
@@ -27,7 +27,7 @@ EOF
 : ${RECODE=recode}
 LC_ALL=$LOCALE_JA \
 ${RECODE}-sr-latin < rec-srl-2.in > rec-srl-2.out \
-  || { exit 1; }
+  || { Exit 1; }
 
 cat <<\EOF > rec-srl-2.ok
 Ispravni argumenti su
diff --git a/gettext-tools/tests/sentence-1 b/gettext-tools/tests/sentence-1
index f5adb4c..62b5a04 100755
--- a/gettext-tools/tests/sentence-1
+++ b/gettext-tools/tests/sentence-1
@@ -113,9 +113,9 @@ This is a secondary sentence
 
 EOF
 
-../sentence-1-prg < s1.in > s1.out || exit 1
+../sentence-1-prg < s1.in > s1.out || Exit 1
 
 : ${DIFF=diff}
-${DIFF} s1.ok s1.out || exit 1
+${DIFF} s1.ok s1.out || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/xgettext-1 b/gettext-tools/tests/xgettext-1
index 5165968..29695a3 100755
--- a/gettext-tools/tests/xgettext-1
+++ b/gettext-tools/tests/xgettext-1
@@ -12,7 +12,7 @@ ${XGETTEXT} -k_ -d zero-domain -x "$abs_top_srcdir"/po/gettext-tools.pot \
   "$abs_top_srcdir"/src/xgettext.c >xg-test1.err 2>&1
 result=$?
 cat xg-test1.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 test ! -f zero-domain.po
 result=$?
diff --git a/gettext-tools/tests/xgettext-10 b/gettext-tools/tests/xgettext-10
index 632a4ee..b82fa95 100755
--- a/gettext-tools/tests/xgettext-10
+++ b/gettext-tools/tests/xgettext-10
@@ -17,7 +17,7 @@ ${XGETTEXT} --add-location=file --omit-header xg-test10a.c xg-test10b.c \
             -o xg-test10.out >xg-test10.err 2>&1
 result=$?
 cat xg-test10.err | grep -v 'warning: Charset' | grep -v '^ '
-test $result = 0 || { exit 1; }
+test $result = 0 || { Exit 1; }
 
 cat <<\EOF > xg-test10.ok
 #: xg-test10a.c xg-test10b.c
diff --git a/gettext-tools/tests/xgettext-11 b/gettext-tools/tests/xgettext-11
index 1b7a869..2378cea 100755
--- a/gettext-tools/tests/xgettext-11
+++ b/gettext-tools/tests/xgettext-11
@@ -17,8 +17,8 @@ gettext ("def");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --no-location --omit-header --add-comments=TRANSLATORS: -d xg-test11.tmp xg-test11.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test11.tmp.po > xg-test11.po || exit 1
+${XGETTEXT} --no-location --omit-header --add-comments=TRANSLATORS: -d xg-test11.tmp xg-test11.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test11.tmp.po > xg-test11.po || Exit 1
 
 cat <<\EOF > xg-test11.ok
 #. TRANSLATORS: this
diff --git a/gettext-tools/tests/xgettext-12 b/gettext-tools/tests/xgettext-12
index fe76f1a..e0ffb5a 100755
--- a/gettext-tools/tests/xgettext-12
+++ b/gettext-tools/tests/xgettext-12
@@ -15,8 +15,8 @@ xngettext ("def", 1);
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -kngettext:1,1 -kxngettext:1,1 -d xg-test12.tmp xg-test12.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test12.tmp.po > xg-test12.po || exit 1
+${XGETTEXT} --omit-header --add-comments -kngettext:1,1 -kxngettext:1,1 -d xg-test12.tmp xg-test12.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test12.tmp.po > xg-test12.po || Exit 1
 
 cat <<\EOF > xg-test12.ok
 #: xg-test12.c:1 xg-test12.c:2
diff --git a/gettext-tools/tests/xgettext-13 b/gettext-tools/tests/xgettext-13
index dcd1004..923a67d 100755
--- a/gettext-tools/tests/xgettext-13
+++ b/gettext-tools/tests/xgettext-13
@@ -36,8 +36,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --add-location --width=30 -d xg-test13.tmp \
-            xg-test13.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test13.tmp.po > xg-test13.po || exit 1
+            xg-test13.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test13.tmp.po > xg-test13.po || Exit 1
 
 cat <<\EOF > xg-test13.ok
 #: x:1 x:2 x:3 x:4 x:5 x:6 x:7
diff --git a/gettext-tools/tests/xgettext-14 b/gettext-tools/tests/xgettext-14
index 8df8a04..8035820 100755
--- a/gettext-tools/tests/xgettext-14
+++ b/gettext-tools/tests/xgettext-14
@@ -20,11 +20,11 @@ EOF
 : ${XGETTEXT=xgettext}
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=ellipsis-unicode -d xg-ellipsis-u.tmp xg-ellipsis-u.c 2>xg-ellipsis-u.err
 
-test `grep -c 'ASCII ellipsis' xg-ellipsis-u.err` = 4 || exit 1
+test `grep -c 'ASCII ellipsis' xg-ellipsis-u.err` = 4 || Exit 1
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=ellipsis-unicode --sentence-end=double-space -d xg-ellipsis-ud.tmp xg-ellipsis-u.c 2>xg-ellipsis-ud.err
 
-test `grep -c 'ASCII ellipsis' xg-ellipsis-ud.err` = 3 || exit 1
+test `grep -c 'ASCII ellipsis' xg-ellipsis-ud.err` = 3 || Exit 1
 
 # --check=space-ellipsis
 cat <<\EOF > xg-space-e.c
@@ -40,7 +40,7 @@ EOF
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=space-ellipsis -d xg-space-e.tmp xg-space-e.c 2>xg-space-e.err
 
-test `grep -c 'space before ellipsis' xg-space-e.err` = 3 || exit 1
+test `grep -c 'space before ellipsis' xg-space-e.err` = 3 || Exit 1
 
 # --check=quote-unicode
 cat <<\EOF > xg-quote-u.c
@@ -94,8 +94,8 @@ EOF
 
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=quote-unicode -d xg-quote-u.tmp xg-quote-u.c 2>xg-quote-u.err
 
-test `grep -c 'ASCII double quote' xg-quote-u.err` = 4 || exit 1
-test `grep -c 'ASCII single quote' xg-quote-u.err` = 12 || exit 1
+test `grep -c 'ASCII double quote' xg-quote-u.err` = 4 || Exit 1
+test `grep -c 'ASCII single quote' xg-quote-u.err` = 12 || Exit 1
 
 # --check=bullet-unicode
 cat <<\EOF > xg-bullet-u1.c
@@ -108,7 +108,7 @@ EOF
 : ${XGETTEXT=xgettext}
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u1.tmp xg-bullet-u1.c 2>xg-bullet-u1.err
 
-test `grep -c 'ASCII bullet' xg-bullet-u1.err` = 1 || { cat xg-bullet-u1.err; exit 1; }
+test `grep -c 'ASCII bullet' xg-bullet-u1.err` = 1 || { cat xg-bullet-u1.err; Exit 1; }
 
 cat <<\EOF > xg-bullet-u2.c
 gettext ("The following is a list of items:\n\
@@ -120,7 +120,7 @@ EOF
 : ${XGETTEXT=xgettext}
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u2.tmp xg-bullet-u2.c 2>xg-bullet-u2.err
 
-test `grep -c 'ASCII bullet' xg-bullet-u2.err` = 1 || { cat xg-bullet-u2.err; exit 1; }
+test `grep -c 'ASCII bullet' xg-bullet-u2.err` = 1 || { cat xg-bullet-u2.err; Exit 1; }
 
 cat <<\EOF > xg-bullet-u3.c
 gettext ("The following is NOT a list of items:\n\
@@ -132,4 +132,4 @@ EOF
 : ${XGETTEXT=xgettext}
 LANGUAGE= LC_ALL=C ${XGETTEXT} --omit-header --add-comments --check=bullet-unicode -d xg-bullet-u3.tmp xg-bullet-u3.c 2>xg-bullet-u3.err
 
-test `grep -c 'ASCII bullet' xg-bullet-u3.err` = 0 || { cat xg-bullet-u3.err; exit 1; }
+test `grep -c 'ASCII bullet' xg-bullet-u3.err` = 0 || { cat xg-bullet-u3.err; Exit 1; }
diff --git a/gettext-tools/tests/xgettext-2 b/gettext-tools/tests/xgettext-2
index ffdd355..0535a97 100755
--- a/gettext-tools/tests/xgettext-2
+++ b/gettext-tools/tests/xgettext-2
@@ -22,8 +22,8 @@ _("")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || exit 1
+${XGETTEXT} -d xg-test2.tmp -k_ --omit-header --no-location xg-test2.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test2.tmp.po > xg-test2.po || Exit 1
 
 cat <<EOF > xg-test2.ok
 #, no-c-format
diff --git a/gettext-tools/tests/xgettext-5 b/gettext-tools/tests/xgettext-5
index b3e7380..85be8ef 100755
--- a/gettext-tools/tests/xgettext-5
+++ b/gettext-tools/tests/xgettext-5
@@ -13,9 +13,9 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --no-location -k_ -o xg-test5.po xg-test5.c 2>/dev/null
-test $? = 1 || { exit 1; }
-${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || exit 1
+test $? = 1 || { Exit 1; }
+${XGETTEXT} --no-location -k_ --from-code=iso-8859-2 -o xg-test5.tmp xg-test5.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test5.tmp > xg-test5.po || Exit 1
 
 sed -e '/POT-Creation-Date/d' < xg-test5.po > xg-test5.pot
 
diff --git a/gettext-tools/tests/xgettext-6 b/gettext-tools/tests/xgettext-6
index 5a54aa3..2bb6c76 100755
--- a/gettext-tools/tests/xgettext-6
+++ b/gettext-tools/tests/xgettext-6
@@ -78,8 +78,8 @@ ${XGETTEXT} --omit-header --no-location -d xg-test6.tmp \
   --flag=my_printf:1:python-format \
   xg-test6.c xg-test6.sh xg-test6.py xg-test6.lisp xg-test6.el \
   xg-test6.jl xg-test6.java xg-test6.awk xg-test6.ycp xg-test6.tcl \
-  xg-test6.pl xg-test6.php  || exit 1
-LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po || exit 1
+  xg-test6.pl xg-test6.php  || Exit 1
+LC_ALL=C tr -d '\r' < xg-test6.tmp.po > xg-test6.po || Exit 1
 
 cat <<\EOF > xg-test6.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-7 b/gettext-tools/tests/xgettext-7
index 22e882b..3bd94fc 100755
--- a/gettext-tools/tests/xgettext-7
+++ b/gettext-tools/tests/xgettext-7
@@ -18,8 +18,8 @@ gettext ("abc");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || exit 1
+${XGETTEXT} --omit-header --add-comments -d xg-test7.tmp xg-test7.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test7.tmp.po > xg-test7.po || Exit 1
 
 cat <<\EOF > xg-test7.ok
 #. first comment
diff --git a/gettext-tools/tests/xgettext-8 b/gettext-tools/tests/xgettext-8
index 2194aed..8475a89 100755
--- a/gettext-tools/tests/xgettext-8
+++ b/gettext-tools/tests/xgettext-8
@@ -32,7 +32,7 @@ _("extract me")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c || exit 1
+${XGETTEXT} -a -j -o xg-test8.po xg-test8.in.c || Exit 1
 
 sed -e '/POT-Creation-Date/d' < xg-test8.po | LC_ALL=C tr -d '\r' > xg-test8.pot
 
diff --git a/gettext-tools/tests/xgettext-9 b/gettext-tools/tests/xgettext-9
index 9489be0..fb16dc9 100755
--- a/gettext-tools/tests/xgettext-9
+++ b/gettext-tools/tests/xgettext-9
@@ -23,8 +23,8 @@ EOF
 ${XGETTEXT} --omit-header \
   --keyword=label:1,\"xhtml-format\",\"xml-format\" \
   --keyword=title:1,\"xhtml-format\",\"xml-format\" \
-  -d xg-test9.tmp xg-test9.c || exit 1
-LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po || exit 1
+  -d xg-test9.tmp xg-test9.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-test9.tmp.po > xg-test9.po || Exit 1
 
 cat <<\EOF > xg-test9.ok
 #. xhtml-format
diff --git a/gettext-tools/tests/xgettext-appdata-1 b/gettext-tools/tests/xgettext-appdata-1
index 47a8884..ac0ed7e 100755
--- a/gettext-tools/tests/xgettext-appdata-1
+++ b/gettext-tools/tests/xgettext-appdata-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gs-1.pot xg-gs-1-empty.appdata.xml 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without AppData support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gs-1.appdata.xml
@@ -57,7 +57,7 @@ cat <<EOF > xg-gs-1.appdata.xml
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gs-1.appdata.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gs-1.appdata.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || Exit 1
 
 cat <<EOF > xg-gs-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-awk-1 b/gettext-tools/tests/xgettext-awk-1
index bd82add..651ea4e 100755
--- a/gettext-tools/tests/xgettext-awk-1
+++ b/gettext-tools/tests/xgettext-awk-1
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-a-1.tmp xg-a-1.awk || exit 1
-LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || exit 1
+  -d xg-a-1.tmp xg-a-1.awk || Exit 1
+LC_ALL=C tr -d '\r' < xg-a-1.tmp.po > xg-a-1.po || Exit 1
 
 cat <<EOF > xg-a-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-awk-2 b/gettext-tools/tests/xgettext-awk-2
index 14908fe..4c904c8 100755
--- a/gettext-tools/tests/xgettext-awk-2
+++ b/gettext-tools/tests/xgettext-awk-2
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-a-2.tmp xg-a-2.awk || exit 1
-LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || exit 1
+  -d xg-a-2.tmp xg-a-2.awk || Exit 1
+LC_ALL=C tr -d '\r' < xg-a-2.tmp.po > xg-a-2.po || Exit 1
 
 cat <<EOF > xg-a-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-c-1 b/gettext-tools/tests/xgettext-c-1
index 039e7ec..b1b5e10 100755
--- a/gettext-tools/tests/xgettext-c-1
+++ b/gettext-tools/tests/xgettext-c-1
@@ -7,8 +7,8 @@
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -d xg-c-1.tmp -k_ --omit-header --no-location \
- "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || exit 1
+ "$abs_top_srcdir"/src/xgettext.c "$abs_top_srcdir"/src/msgfmt.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-1.tmp.po > xg-c-1.po || Exit 1
 
 : ${DIFF=diff}
 ${DIFF} "$abs_srcdir"/xg-c-1.ok.po xg-c-1.po
diff --git a/gettext-tools/tests/xgettext-c-10 b/gettext-tools/tests/xgettext-c-10
index 5c876b0..9e4e3e9 100755
--- a/gettext-tools/tests/xgettext-c-10
+++ b/gettext-tools/tests/xgettext-c-10
@@ -16,8 +16,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2 --keyword=tr:1 --keyword=tr:1,2c \
-  -d xg-c-10.tmp xg-c-10.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po || exit 1
+  -d xg-c-10.tmp xg-c-10.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-10.tmp.po > xg-c-10.po || Exit 1
 
 cat <<EOF > xg-c-10.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-11 b/gettext-tools/tests/xgettext-c-11
index 2019eb8..bc66f31 100755
--- a/gettext-tools/tests/xgettext-c-11
+++ b/gettext-tools/tests/xgettext-c-11
@@ -16,8 +16,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=i18n:1 --keyword=i18n:1c,2,2t --keyword=i18n:1,2,3t \
-  -d xg-c-11.tmp xg-c-11.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po || exit 1
+  -d xg-c-11.tmp xg-c-11.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-11.tmp.po > xg-c-11.po || Exit 1
 
 cat <<EOF > xg-c-11.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-12 b/gettext-tools/tests/xgettext-c-12
index 2e9d7fd..6fe1d7f 100755
--- a/gettext-tools/tests/xgettext-c-12
+++ b/gettext-tools/tests/xgettext-c-12
@@ -9,8 +9,8 @@ gettext ("%1% on, %2% off");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-12.tmp xg-c-12.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-12.tmp.po > xg-c-12.po || Exit 1
 
 cat <<EOF > xg-c-12.ok
 msgid "%1% on, %2% off"
diff --git a/gettext-tools/tests/xgettext-c-13 b/gettext-tools/tests/xgettext-c-13
index 01464b0..9e33faa 100755
--- a/gettext-tools/tests/xgettext-c-13
+++ b/gettext-tools/tests/xgettext-c-13
@@ -15,8 +15,8 @@ ${XGETTEXT} --omit-header --no-location -d xg-c-13.tmp \
   --qt \
   --flag=foo:1:qt-format --flag=gettext:1:pass-qt-format \
   --keyword=tr:1,1t --keyword=tr:1,2c,2t --keyword=tr:1,1,2c,3t \
-  xg-c-13.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po || exit 1
+  xg-c-13.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-13.tmp.po > xg-c-13.po || Exit 1
 
 cat <<EOF > xg-c-13.ok
 #, qt-format
diff --git a/gettext-tools/tests/xgettext-c-14 b/gettext-tools/tests/xgettext-c-14
index 2cb5a5c..498d07c 100755
--- a/gettext-tools/tests/xgettext-c-14
+++ b/gettext-tools/tests/xgettext-c-14
@@ -17,8 +17,8 @@ gettext("heuristic %1% on, %2% off");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-14.tmp --boost xg-c-14.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-14.tmp.po > xg-c-14.po || Exit 1
 
 # The first 4 are not marked as c-format, because they are known as
 # boost-format. The last 4 are governed by the heuristic. The first two
diff --git a/gettext-tools/tests/xgettext-c-15 b/gettext-tools/tests/xgettext-c-15
index 5d86818..97c41b3 100755
--- a/gettext-tools/tests/xgettext-c-15
+++ b/gettext-tools/tests/xgettext-c-15
@@ -13,8 +13,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location \
   --keyword=Q_:1g --keyword=Q_:1g,2g \
-  -d xg-c-15.tmp xg-c-15.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po || exit 1
+  -d xg-c-15.tmp xg-c-15.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-15.tmp.po > xg-c-15.po || Exit 1
 
 cat <<EOF > xg-c-15.ok
 msgctxt "Printer"
diff --git a/gettext-tools/tests/xgettext-c-16 b/gettext-tools/tests/xgettext-c-16
index a594492..9633ead 100755
--- a/gettext-tools/tests/xgettext-c-16
+++ b/gettext-tools/tests/xgettext-c-16
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-c-16.tmp xg-c-16.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po || exit 1
+  -d xg-c-16.tmp xg-c-16.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-16.tmp.po > xg-c-16.po || Exit 1
 
 cat <<EOF > xg-c-16.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-c-17 b/gettext-tools/tests/xgettext-c-17
index 0789c04..ec81476 100755
--- a/gettext-tools/tests/xgettext-c-17
+++ b/gettext-tools/tests/xgettext-c-17
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -d xg-c-17.tmp --language=C++ --kde \
-  xg-c-17.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || exit 1
+  xg-c-17.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-17.tmp.po > xg-c-17.po || Exit 1
 
 cat <<EOF > xg-c-17.ok
 #, c-format, kde-format
diff --git a/gettext-tools/tests/xgettext-c-18 b/gettext-tools/tests/xgettext-c-18
index deac1f0..6efb217 100755
--- a/gettext-tools/tests/xgettext-c-18
+++ b/gettext-tools/tests/xgettext-c-18
@@ -12,8 +12,8 @@ if (days > 7 && days < 14)
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-c-18.tmp xg-c-18.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-18.tmp.po > xg-c-18.po || Exit 1
 
 cat <<EOF > xg-c-18.ok
 #, c-format, range: 1..6
diff --git a/gettext-tools/tests/xgettext-c-19 b/gettext-tools/tests/xgettext-c-19
index 674af4f..628ecb8 100755
--- a/gettext-tools/tests/xgettext-c-19
+++ b/gettext-tools/tests/xgettext-c-19
@@ -11,7 +11,7 @@ cat <<\EOF > err1.c
 gettext ("\U00110000");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep 'invalid Unicode character' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.c 2>&1; exit) | grep 'invalid Unicode character' || Exit 1
 
 cat <<\EOF > xg-c-19.in.c
 /* 最初のコメント */
@@ -29,12 +29,12 @@ EOF
 
 : ${ICONV=iconv}
 iconv -f UTF-8 -t EUC-JP < xg-c-19.in.c > xg-c-19.c \
-  || { echo "Skipping test: iconv does not work for EUC-JP"; exit 77; }
+  || { echo "Skipping test: iconv does not work for EUC-JP"; Exit 77; }
 
 ${XGETTEXT} --from-code=EUC-JP --add-comments --no-location --no-wrap \
 	    -o - xg-c-19.c | grep -v 'POT-Creation-Date' > xg-c-19.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-19.tmp.po > xg-c-19.po || Exit 1
 
 cat <<\EOF > xg-c-19.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-c-2 b/gettext-tools/tests/xgettext-c-2
index 0c53be8..c90786d 100755
--- a/gettext-tools/tests/xgettext-c-2
+++ b/gettext-tools/tests/xgettext-c-2
@@ -24,8 +24,8 @@ _("after double")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || exit 1
+${XGETTEXT} -d xg-c-2.tmp -k_ --omit-header --no-location xg-c-2.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-2.tmp.po > xg-c-2.po || Exit 1
 
 cat <<EOF > xg-c-2.ok
 #, no-c-format
diff --git a/gettext-tools/tests/xgettext-c-20 b/gettext-tools/tests/xgettext-c-20
index 283f8d0..cfbc345 100755
--- a/gettext-tools/tests/xgettext-c-20
+++ b/gettext-tools/tests/xgettext-c-20
@@ -11,7 +11,7 @@ bbb
 )ccc");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err0.cc 2>&1; exit) | grep 'unterminated string literal' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err0.cc 2>&1; exit) | grep 'unterminated string literal' || Exit 1
 
 cat <<\EOF > err1.cc
 gettext (R"aaa(
@@ -19,7 +19,7 @@ bbb
 )ccc");
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.cc 2>&1; exit) | grep 'unterminated string literal' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location --no-wrap -o - err1.cc 2>&1; exit) | grep 'unterminated string literal' || Exit 1
 
 cat <<\EOF > xg-c-20.cc
 #define X ""
@@ -80,8 +80,8 @@ EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - xg-c-20.cc | grep -v 'POT-Creation-Date' > xg-c-20.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-20.tmp.po > xg-c-20.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-20.tmp.po > xg-c-20.po || Exit 1
 
 cat <<\EOF > xg-c-20.ok
 # SOME DESCRIPTIVE TITLE.
@@ -123,7 +123,7 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} xg-c-20.ok xg-c-20.po || exit 1
+${DIFF} xg-c-20.ok xg-c-20.po || Exit 1
 
 cat <<\EOF > xg-c-20.c
 gettext (R"aaa(This is NOT a raw string");
@@ -135,8 +135,8 @@ EOF
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - xg-c-20.c | grep -v 'POT-Creation-Date' > xg-c-20c.tmp.po \
-	    || exit 1
-LC_ALL=C tr -d '\r' < xg-c-20c.tmp.po > xg-c-20c.po || exit 1
+	    || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-20c.tmp.po > xg-c-20c.po || Exit 1
 
 cat <<\EOF > xg-c-20c.ok
 # SOME DESCRIPTIVE TITLE.
@@ -161,4 +161,4 @@ msgid "aaa(This is NOT a raw string"
 msgstr ""
 EOF
 
-${DIFF} xg-c-20c.ok xg-c-20c.po || exit 1
+${DIFF} xg-c-20c.ok xg-c-20c.po || Exit 1
diff --git a/gettext-tools/tests/xgettext-c-21 b/gettext-tools/tests/xgettext-c-21
index 4fdcfe9..c96b3c9 100755
--- a/gettext-tools/tests/xgettext-c-21
+++ b/gettext-tools/tests/xgettext-c-21
@@ -7,8 +7,8 @@
 
 ${XGETTEXT} --add-comments --no-location --no-wrap \
 	    -o - "$abs_srcdir"/xg-c-21.c \
-  | grep -v 'POT-Creation-Date' > xg-c-21.tmp.po || exit 1
-LC_ALL=C tr -d '\r' < xg-c-21.tmp.po > xg-c-21.po || exit 1
+  | grep -v 'POT-Creation-Date' > xg-c-21.tmp.po || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-21.tmp.po > xg-c-21.po || Exit 1
 
 cat <<\EOF > xg-c-21.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-c-3 b/gettext-tools/tests/xgettext-c-3
index d522457..c06c056 100755
--- a/gettext-tools/tests/xgettext-c-3
+++ b/gettext-tools/tests/xgettext-c-3
@@ -11,8 +11,8 @@ gettext("nothing");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || exit 1
+${XGETTEXT} --omit-header --add-location -d xg-c-3.tmp xg-c-3.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-3.tmp.po > xg-c-3.po || Exit 1
 
 cat <<EOF > xg-c-3.ok
 #: bozo:42
diff --git a/gettext-tools/tests/xgettext-c-4 b/gettext-tools/tests/xgettext-c-4
index 7db3e35..9f2b1c5 100755
--- a/gettext-tools/tests/xgettext-c-4
+++ b/gettext-tools/tests/xgettext-c-4
@@ -8,8 +8,8 @@ main()??<printf(gettext("Hello, " "World!" "??/n"));return 0 ? a??(0??'1??) : 1?
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || exit 1
+${XGETTEXT} --omit-header --no-location --trigraphs -d xg-c-4.tmp xg-c-4.in.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-4.tmp.po > xg-c-4.po || Exit 1
 
 cat <<EOF > xg-c-4.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-c-5 b/gettext-tools/tests/xgettext-c-5
index 14c90fe..ffe142a 100755
--- a/gettext-tools/tests/xgettext-c-5
+++ b/gettext-tools/tests/xgettext-c-5
@@ -8,8 +8,8 @@ main(){printf(gettext/*puke*/(/*barf*/"Hello, " "World!" "\n")); }
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po || exit 1
+${XGETTEXT} --omit-header --no-location --add-comments -d xg-c-5.tmp xg-c-5.in.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-5.tmp.po > xg-c-5.po || Exit 1
 
 cat <<EOF > xg-c-5.ok
 #. puke
diff --git a/gettext-tools/tests/xgettext-c-6 b/gettext-tools/tests/xgettext-c-6
index 3d839aa..333d756 100755
--- a/gettext-tools/tests/xgettext-c-6
+++ b/gettext-tools/tests/xgettext-c-6
@@ -19,8 +19,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=XXX \
-  -d xg-c-6.tmp xg-c-6.in.C || exit 1
-LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || exit 1
+  -d xg-c-6.tmp xg-c-6.in.C || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-6.tmp.po > xg-c-6.po || Exit 1
 
 cat <<EOF > xg-c-6.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-c-7 b/gettext-tools/tests/xgettext-c-7
index 248bfa9..4192030 100755
--- a/gettext-tools/tests/xgettext-c-7
+++ b/gettext-tools/tests/xgettext-c-7
@@ -38,8 +38,8 @@ main()
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -c --c++ -d xg-c-7.tmp xg-c-7.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-7.tmp.po > xg-c-7.po || Exit 1
 
 cat <<EOF > xg-c-7.ok
 #. This is a comment which immediately before a keyword.
diff --git a/gettext-tools/tests/xgettext-c-8 b/gettext-tools/tests/xgettext-c-8
index 48f160c..c764f7a 100755
--- a/gettext-tools/tests/xgettext-c-8
+++ b/gettext-tools/tests/xgettext-c-8
@@ -14,8 +14,8 @@ void foo ()
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po || exit 1
+${XGETTEXT} --omit-header --no-location -k_ -o xg-c-8.tmp xg-c-8.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-8.tmp > xg-c-8.po || Exit 1
 
 cat <<EOF > xg-c-8.ok
 #, c-format
diff --git a/gettext-tools/tests/xgettext-c-9 b/gettext-tools/tests/xgettext-c-9
index 340e88a..a8be451 100755
--- a/gettext-tools/tests/xgettext-c-9
+++ b/gettext-tools/tests/xgettext-c-9
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-c-9.tmp xg-c-9.c || exit 1
-LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po || exit 1
+  -d xg-c-9.tmp xg-c-9.c || Exit 1
+LC_ALL=C tr -d '\r' < xg-c-9.tmp.po > xg-c-9.po || Exit 1
 
 cat <<EOF > xg-c-9.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-1 b/gettext-tools/tests/xgettext-csharp-1
index a7a77e9..cbb3c32 100755
--- a/gettext-tools/tests/xgettext-csharp-1
+++ b/gettext-tools/tests/xgettext-csharp-1
@@ -31,8 +31,8 @@ third line");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -c -d xg-cs-1.tmp xg-cs-1.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-1.tmp.po > xg-cs-1.po || Exit 1
 
 cat <<EOF > xg-cs-1.ok
 #. standard usage
diff --git a/gettext-tools/tests/xgettext-csharp-2 b/gettext-tools/tests/xgettext-csharp-2
index cf8d4a2..934af53 100755
--- a/gettext-tools/tests/xgettext-csharp-2
+++ b/gettext-tools/tests/xgettext-csharp-2
@@ -29,7 +29,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c --from-code=UTF-8 xg-cs-2.cs \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-2.po || Exit 1
 
 cat <<\EOF > xg-cs-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-csharp-3 b/gettext-tools/tests/xgettext-csharp-3
index 30d9a9b..0e91e94 100755
--- a/gettext-tools/tests/xgettext-csharp-3
+++ b/gettext-tools/tests/xgettext-csharp-3
@@ -51,7 +51,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --add-location -c -kMyGetString:2 xg-cs-3.cs 2>/dev/null \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-3.po || Exit 1
 
 cat <<\EOF > xg-cs-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-csharp-4 b/gettext-tools/tests/xgettext-csharp-4
index 5cca144..1fc2ef0 100755
--- a/gettext-tools/tests/xgettext-csharp-4
+++ b/gettext-tools/tests/xgettext-csharp-4
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=MyPluralString:2,3 \
-  -d xg-cs-4.tmp xg-cs-4.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || exit 1
+  -d xg-cs-4.tmp xg-cs-4.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-4.tmp.po > xg-cs-4.po || Exit 1
 
 cat <<EOF > xg-cs-4.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-csharp-5 b/gettext-tools/tests/xgettext-csharp-5
index 7584a16..2d6b0c4 100755
--- a/gettext-tools/tests/xgettext-csharp-5
+++ b/gettext-tools/tests/xgettext-csharp-5
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-cs-5.tmp xg-cs-5.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || exit 1
+  -d xg-cs-5.tmp xg-cs-5.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-5.tmp.po > xg-cs-5.po || Exit 1
 
 cat <<EOF > xg-cs-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-6 b/gettext-tools/tests/xgettext-csharp-6
index 390c620..83cf7e5 100755
--- a/gettext-tools/tests/xgettext-csharp-6
+++ b/gettext-tools/tests/xgettext-csharp-6
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-cs-6.tmp xg-cs-6.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || exit 1
+  -d xg-cs-6.tmp xg-cs-6.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-6.tmp.po > xg-cs-6.po || Exit 1
 
 cat <<EOF > xg-cs-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-csharp-7 b/gettext-tools/tests/xgettext-csharp-7
index 9f5643b..6cb31f2 100755
--- a/gettext-tools/tests/xgettext-csharp-7
+++ b/gettext-tools/tests/xgettext-csharp-7
@@ -9,8 +9,8 @@ Console.WriteLine(rm.GetParticularString("Help", "about"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || exit 1
-LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-cs-7.tmp xg-cs-7.cs || Exit 1
+LC_ALL=C tr -d '\r' < xg-cs-7.tmp.po > xg-cs-7.po || Exit 1
 
 cat <<EOF > xg-cs-7.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-csharp-8 b/gettext-tools/tests/xgettext-csharp-8
index f5e5694..5b43f11 100755
--- a/gettext-tools/tests/xgettext-csharp-8
+++ b/gettext-tools/tests/xgettext-csharp-8
@@ -21,7 +21,7 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --output - --add-location xg-cs-8.cs -a 2>/dev/null | \
   sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-cs-8.po || \
-  exit 1
+  Exit 1
 
 cat <<\EOF > xg-cs-8.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-desktop-1 b/gettext-tools/tests/xgettext-desktop-1
index c6f9df1..212043f 100755
--- a/gettext-tools/tests/xgettext-desktop-1
+++ b/gettext-tools/tests/xgettext-desktop-1
@@ -11,33 +11,33 @@ This is an invalid line
 Name =Foo
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err1.desktop 2>&1; exit) | grep "missing '=' after" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err1.desktop 2>&1; exit) | grep "missing '=' after" || Exit 1
 
 cat <<\EOF >err2.desktop
 [Desktop Entry
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err2.desktop 2>&1; exit) | grep "unterminated group name" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err2.desktop 2>&1; exit) | grep "unterminated group name" || Exit 1
 
 cat <<\EOF >err3.desktop
 [Desktop Entry]
   Not a blank line!
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err3.desktop 2>&1; exit) | grep "invalid non-blank line" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err3.desktop 2>&1; exit) | grep "invalid non-blank line" || Exit 1
 
 cat <<\EOF >err4.desktop
 [Desktop Entry]a
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err4.desktop 2>&1; exit) | grep "invalid non-blank character" || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - err4.desktop 2>&1; exit) | grep "invalid non-blank character" || Exit 1
 
 # gettext 0.19.4 issued an baseless warning of this.
 cat <<\EOF >ok4.desktop
 [Desktop Entry]
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - ok4.desktop 2>&1; exit) | grep "invalid non-blank character" && exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --add-comments -o - ok4.desktop 2>&1; exit) | grep "invalid non-blank character" && Exit 1
 
 cat <<\EOF > xg.desktop
 [Desktop Entry]
@@ -53,7 +53,7 @@ X-Foo = bar
 Keywords=Keyword1;Keyword2;Key\;word3;
 EOF
 
-${XGETTEXT} --add-comments -o - xg.desktop | grep -v 'POT-Creation-Date' > xg-desktop.pot || exit 1
+${XGETTEXT} --add-comments -o - xg.desktop | grep -v 'POT-Creation-Date' > xg-desktop.pot || Exit 1
 
 cat <<\EOF > xg-desktop.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-elisp-1 b/gettext-tools/tests/xgettext-elisp-1
index 7d73dbb..ccb75bc 100755
--- a/gettext-tools/tests/xgettext-elisp-1
+++ b/gettext-tools/tests/xgettext-elisp-1
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-el-1.tmp xg-el-1.el || exit 1
-LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || exit 1
+  -d xg-el-1.tmp xg-el-1.el || Exit 1
+LC_ALL=C tr -d '\r' < xg-el-1.tmp.po > xg-el-1.po || Exit 1
 
 cat <<EOF > xg-el-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-elisp-2 b/gettext-tools/tests/xgettext-elisp-2
index 22c472e..e67811d 100755
--- a/gettext-tools/tests/xgettext-elisp-2
+++ b/gettext-tools/tests/xgettext-elisp-2
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-el-2.tmp xg-el-2.el || exit 1
-LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || exit 1
+  -d xg-el-2.tmp xg-el-2.el || Exit 1
+LC_ALL=C tr -d '\r' < xg-el-2.tmp.po > xg-el-2.po || Exit 1
 
 cat <<EOF > xg-el-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index 3fd95f3..b31b3e1 100755
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-1.pot xg-gl-1-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-1-widgets.glade
@@ -1330,7 +1330,7 @@ for said code in libglade.</text>
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gl-1-widgets.glade | grep -v 'POT-Creation-Date' > xg-gl-1.pot || Exit 1
 
 cat <<EOF > xg-gl-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index 7b3fb0f..a5e9558 100755
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -13,7 +13,7 @@ EOF
 ${XGETTEXT} -o xg-gl-2.pot xg-gl-2-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<\EOF > xg-gl-2-simple.glade
@@ -55,7 +55,7 @@ cat <<\EOF > xg-gl-2-simple.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || exit 1
+${XGETTEXT} --add-comments -o xg-gl-2.tmp xg-gl-2-simple.glade  || Exit 1
 # Don't simplify this to "grep ... < xg-gl-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-2.tmp | grep -v 'POT-Creation-Date' > xg-gl-2.pot
diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index 38010fb..909179f 100755
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-3.pot xg-gl-3-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-3-asciitable.glade2
@@ -162,7 +162,7 @@ button or double click the character in the table.</property>
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2  || exit 1
+${XGETTEXT} -o xg-gl-3.tmp xg-gl-3-asciitable.glade2  || Exit 1
 # Don't simplify this to "grep ... < xg-gl-3.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-3.tmp | grep -v 'POT-Creation-Date' > xg-gl-3.pot
diff --git a/gettext-tools/tests/xgettext-glade-4 b/gettext-tools/tests/xgettext-glade-4
index e753450..d66a0f7 100755
--- a/gettext-tools/tests/xgettext-glade-4
+++ b/gettext-tools/tests/xgettext-glade-4
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-4.pot xg-gl-4-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-4.glade
@@ -35,7 +35,7 @@ cat <<EOF > xg-gl-4.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || exit 1
+${XGETTEXT} -o xg-gl-4.tmp xg-gl-4.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-4.tmp | grep -v 'POT-Creation-Date' > xg-gl-4.pot
@@ -90,7 +90,7 @@ cat <<EOF > xg-gl-4a.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade || exit 1
+${XGETTEXT} -o xg-gl-4a.tmp xg-gl-4a.glade || Exit 1
 # Look upwards
 cat xg-gl-4a.tmp | grep -v 'POT-Creation-Date' > xg-gl-4a.pot
 
diff --git a/gettext-tools/tests/xgettext-glade-5 b/gettext-tools/tests/xgettext-glade-5
index 3877808..2ce6132 100755
--- a/gettext-tools/tests/xgettext-glade-5
+++ b/gettext-tools/tests/xgettext-glade-5
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gl-5.pot xg-gl-5-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-5.glade
@@ -54,7 +54,7 @@ cat <<EOF > xg-gl-5.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade || exit 1
+${XGETTEXT} -o xg-gl-5.tmp xg-gl-5.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot
@@ -98,7 +98,7 @@ test $result = 0 || {
 
 # Check with --extract-all option
 rm xg-gl-5.tmp
-${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade || exit 1
+${XGETTEXT} -a -o xg-gl-5.tmp xg-gl-5.glade || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5.tmp | grep -v 'POT-Creation-Date' > xg-gl-5.pot
@@ -149,7 +149,7 @@ cat <<EOF > xg-gl-5b.glade
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null || exit 1
+${XGETTEXT} -o xg-gl-5b.tmp xg-gl-5b.glade 2>/dev/null || Exit 1
 # Don't simplify this to "grep ... < xg-gl-5b.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-gl-5b.tmp | grep -v 'POT-Creation-Date' > xg-gl-5b.pot
diff --git a/gettext-tools/tests/xgettext-glade-6 b/gettext-tools/tests/xgettext-glade-6
index 49fecf8..e195cdc 100755
--- a/gettext-tools/tests/xgettext-glade-6
+++ b/gettext-tools/tests/xgettext-glade-6
@@ -14,7 +14,7 @@ EOF
 ${XGETTEXT} -o xg-gl-6.pot xg-gl-6-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-6.ui
@@ -32,7 +32,7 @@ cat <<EOF > xg-gl-6.ui
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1
+${XGETTEXT} -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || Exit 1
 
 cat <<EOF > xg-gl-6.ok
 # SOME DESCRIPTIVE TITLE.
@@ -69,7 +69,7 @@ test $result = 0 || {
 }
 
 # Check with --extract-all option.
-${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || exit 1
+${XGETTEXT} -a -o - xg-gl-6.ui | grep -v 'POT-Creation-Date' > xg-gl-6.pot || Exit 1
 
 # Must be ignored.
 ${DIFF} xg-gl-6.ok xg-gl-6.pot
diff --git a/gettext-tools/tests/xgettext-glade-7 b/gettext-tools/tests/xgettext-glade-7
index d037415..8a559d7 100755
--- a/gettext-tools/tests/xgettext-glade-7
+++ b/gettext-tools/tests/xgettext-glade-7
@@ -14,7 +14,7 @@ EOF
 ${XGETTEXT} -o xg-gl-7.pot xg-gl-7-empty.glade 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without Glade support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gl-7.ui
@@ -184,7 +184,7 @@ cat <<EOF > xg-gl-7.ui
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot || exit 1
+${XGETTEXT} -o - xg-gl-7.ui | grep -v 'POT-Creation-Date' > xg-gl-7.pot || Exit 1
 
 cat <<\EOF > xg-gl-7.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-gsettings-1 b/gettext-tools/tests/xgettext-gsettings-1
index 387f476..75fc725 100755
--- a/gettext-tools/tests/xgettext-gsettings-1
+++ b/gettext-tools/tests/xgettext-gsettings-1
@@ -12,7 +12,7 @@ EOF
 ${XGETTEXT} -o xg-gs-1.pot xg-gs-1-empty.gschema.xml 2>/dev/null
 test $? = 0 || {
   echo "Skipping test: xgettext was built without GSettings support"
-  exit 77
+  Exit 77
 }
 
 cat <<EOF > xg-gs-1.gschema.xml
@@ -43,7 +43,7 @@ cat <<EOF > xg-gs-1.gschema.xml
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || exit 1
+${XGETTEXT} --add-comments -o - xg-gs-1.gschema.xml | grep -v 'POT-Creation-Date' > xg-gs-1.pot || Exit 1
 
 cat <<EOF > xg-gs-1.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-its-1 b/gettext-tools/tests/xgettext-its-1
index 9e3cac5..b77d5b1 100755
--- a/gettext-tools/tests/xgettext-its-1
+++ b/gettext-tools/tests/xgettext-its-1
@@ -13,7 +13,7 @@ cat <<\EOF > empty.xml
 <empty></empty>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 test -d its || mkdir its
 
@@ -22,7 +22,7 @@ cat <<\EOF > its/empty-1.loc
 <locatingRules/>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/empty-2.loc
 <?xml version="1.0"?>
@@ -33,7 +33,7 @@ cat <<\EOF > its/empty-2.loc
 </locatingRules>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/empty.its
 <?xml version="1.0"?>
@@ -41,7 +41,7 @@ cat <<\EOF > its/empty.its
 </its:rules>
 EOF
 
-${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; exit 1; }
+${XGETTEXT} --itstool -o empty.pot empty.xml 2>empty.err || { cat empty.err; Exit 1; }
 
 cat <<\EOF > its/messages.loc
 <?xml version="1.0"?>
@@ -251,7 +251,7 @@ EOF
 
 : ${DIFF=diff}
 
-${XGETTEXT} --itstool --no-wrap --omit-header -o messages.pot messages.xml 2>messages.err || { cat messages.err; exit 1; }
+${XGETTEXT} --itstool --no-wrap --omit-header -o messages.pot messages.xml 2>messages.err || { cat messages.err; Exit 1; }
 ${DIFF} messages.ok messages.pot
 result=$?
 test $result = 0 || exit $result
@@ -267,7 +267,7 @@ cd po
 GETTEXTDATADIR=..
 export GETTEXTDATADIR
 
-${XGETTEXT} --itstool --no-wrap --omit-header --directory=.. -o messages.pot.in data/messages.msg.in 2>messages.err || { cat messages.err; exit 1; }
+${XGETTEXT} --itstool --no-wrap --omit-header --directory=.. -o messages.pot.in data/messages.msg.in 2>messages.err || { cat messages.err; Exit 1; }
 sed -e 's!^#: data/messages.msg.in!#: messages.xml!' \
   < messages.pot.in > messages.pot
 
diff --git a/gettext-tools/tests/xgettext-its-2 b/gettext-tools/tests/xgettext-its-2
index 599d889..674a141 100755
--- a/gettext-tools/tests/xgettext-its-2
+++ b/gettext-tools/tests/xgettext-its-2
@@ -39,24 +39,24 @@ unset XDG_DATA_DIRS
 
 ${XGETTEXT} -o /dev/null input.a 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
 result=$?
-test $result = 0 || exit 1
+test $result = 0 || Exit 1
 
 GETTEXTDATADIR=a
 export GETTEXTDATADIR
 ${XGETTEXT} -o /dev/null input.a 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
 result=$?
-test $result = 0 && exit 1
+test $result = 0 && Exit 1
 
 GETTEXTDATADIRS=b:a
 export GETTEXTDATADIRS
 ${XGETTEXT} -o /dev/null input.b 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
 result=$?
-test $result = 0 && exit 1
+test $result = 0 && Exit 1
 
 XDG_DATA_DIRS=xa
 export XDG_DATA_DIRS
 ${XGETTEXT} -o /dev/null input.xa 2>&1 | grep 'is unknown; will try C' 2>&1 >/dev/null
 result=$?
-test $result = 0 && exit 1
+test $result = 0 && Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/xgettext-java-1 b/gettext-tools/tests/xgettext-java-1
index 2d73c22..53fb5ee 100755
--- a/gettext-tools/tests/xgettext-java-1
+++ b/gettext-tools/tests/xgettext-java-1
@@ -29,8 +29,8 @@ class TestCase {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -c -d xg-j-1.tmp xg-j-1.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-1.tmp.po > xg-j-1.po || Exit 1
 
 cat <<EOF > xg-j-1.ok
 #. standard usage
diff --git a/gettext-tools/tests/xgettext-java-2 b/gettext-tools/tests/xgettext-java-2
index 6cdce99..5f20864 100755
--- a/gettext-tools/tests/xgettext-java-2
+++ b/gettext-tools/tests/xgettext-java-2
@@ -56,7 +56,7 @@ comment! */ "this is a single " /* now comes the concatenation! */ + // after +
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || exit 1
+${XGETTEXT} --from-code=ISO-8859-1 -c -o xg-j-2.tmp xg-j-2.java 2>/dev/null || Exit 1
 # Don't simplify this to "grep ... < xg-j-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-j-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-j-2.pot
diff --git a/gettext-tools/tests/xgettext-java-3 b/gettext-tools/tests/xgettext-java-3
index f288b15..b10ccaa 100755
--- a/gettext-tools/tests/xgettext-java-3
+++ b/gettext-tools/tests/xgettext-java-3
@@ -14,8 +14,8 @@ class TestCase {
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-j-3.tmp xg-j-3.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-3.tmp.po > xg-j-3.po || Exit 1
 
 cat <<EOF > xg-j-3.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-java-4 b/gettext-tools/tests/xgettext-java-4
index f77f8ee..321eada 100755
--- a/gettext-tools/tests/xgettext-java-4
+++ b/gettext-tools/tests/xgettext-java-4
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:2,3 \
-  -d xg-j-4.tmp xg-j-4.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || exit 1
+  -d xg-j-4.tmp xg-j-4.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-4.tmp.po > xg-j-4.po || Exit 1
 
 cat <<EOF > xg-j-4.ok
 msgid "test 1"
diff --git a/gettext-tools/tests/xgettext-java-5 b/gettext-tools/tests/xgettext-java-5
index 882b0e1..bd9587f 100755
--- a/gettext-tools/tests/xgettext-java-5
+++ b/gettext-tools/tests/xgettext-java-5
@@ -22,8 +22,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-j-5.tmp xg-j-5.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || exit 1
+  -d xg-j-5.tmp xg-j-5.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-5.tmp.po > xg-j-5.po || Exit 1
 
 cat <<EOF > xg-j-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-java-6 b/gettext-tools/tests/xgettext-java-6
index e8f458d..066cfca 100755
--- a/gettext-tools/tests/xgettext-java-6
+++ b/gettext-tools/tests/xgettext-java-6
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-j-6.tmp xg-j-6.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || exit 1
+  -d xg-j-6.tmp xg-j-6.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-6.tmp.po > xg-j-6.po || Exit 1
 
 cat <<EOF > xg-j-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-java-7 b/gettext-tools/tests/xgettext-java-7
index bf3f933..b61680c 100755
--- a/gettext-tools/tests/xgettext-java-7
+++ b/gettext-tools/tests/xgettext-java-7
@@ -10,8 +10,8 @@ System.out.println(GettextResourceBundle.pgettext("Help", "about"));
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || exit 1
-LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-j-7.tmp xg-j-7.java || Exit 1
+LC_ALL=C tr -d '\r' < xg-j-7.tmp.po > xg-j-7.po || Exit 1
 
 cat <<EOF > xg-j-7.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-javascript-1 b/gettext-tools/tests/xgettext-javascript-1
index 198c30e..d4a3bf6 100755
--- a/gettext-tools/tests/xgettext-javascript-1
+++ b/gettext-tools/tests/xgettext-javascript-1
@@ -20,7 +20,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-1.tmp xg-js-1.js 2>xg-js-1.err
-test $? = 0 || { cat xg-js-1.err; exit 1; }
+test $? = 0 || { cat xg-js-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-1.pot
diff --git a/gettext-tools/tests/xgettext-javascript-2 b/gettext-tools/tests/xgettext-javascript-2
index 3f6e6d4..b7c266a 100755
--- a/gettext-tools/tests/xgettext-javascript-2
+++ b/gettext-tools/tests/xgettext-javascript-2
@@ -32,7 +32,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-2.tmp xg-js-2.js 2>xg-js-2.err
-test $? = 0 || { cat xg-js-2.err; exit 1; }
+test $? = 0 || { cat xg-js-2.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-2.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-2.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-2.pot
diff --git a/gettext-tools/tests/xgettext-javascript-3 b/gettext-tools/tests/xgettext-javascript-3
index b37b5a5..ed1f30d 100755
--- a/gettext-tools/tests/xgettext-javascript-3
+++ b/gettext-tools/tests/xgettext-javascript-3
@@ -15,7 +15,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location -o xg-js-3.tmp xg-js-3.js 2>xg-js-3.err
-test $? = 0 || { cat xg-js-3.err; exit 1; }
+test $? = 0 || { cat xg-js-3.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-3.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-3.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-3.pot
diff --git a/gettext-tools/tests/xgettext-javascript-4 b/gettext-tools/tests/xgettext-javascript-4
index 399b97d..5932f6c 100755
--- a/gettext-tools/tests/xgettext-javascript-4
+++ b/gettext-tools/tests/xgettext-javascript-4
@@ -11,7 +11,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-4.tmp xg-js-4.js 2>xg-js-4.err
-test $? = 0 || { cat xg-js-4.err; exit 1; }
+test $? = 0 || { cat xg-js-4.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-4.pot
diff --git a/gettext-tools/tests/xgettext-javascript-5 b/gettext-tools/tests/xgettext-javascript-5
index 1fd08b5..7baa47d 100755
--- a/gettext-tools/tests/xgettext-javascript-5
+++ b/gettext-tools/tests/xgettext-javascript-5
@@ -27,7 +27,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-5.tmp xg-js-5.js 2>xg-js-5.err
-test $? = 0 || { cat xg-js-5.err; exit 1; }
+test $? = 0 || { cat xg-js-5.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-5.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-5.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-5.pot
diff --git a/gettext-tools/tests/xgettext-javascript-6 b/gettext-tools/tests/xgettext-javascript-6
index 1057d33..375e377 100755
--- a/gettext-tools/tests/xgettext-javascript-6
+++ b/gettext-tools/tests/xgettext-javascript-6
@@ -30,7 +30,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-js-6.tmp xg-js-6.js 2>xg-js-6.err
-test $? = 0 || { cat xg-js-6.err; exit 1; }
+test $? = 0 || { cat xg-js-6.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-js-6.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-js-6.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-js-6.pot
diff --git a/gettext-tools/tests/xgettext-librep-1 b/gettext-tools/tests/xgettext-librep-1
index 9463baa..fa89f94 100755
--- a/gettext-tools/tests/xgettext-librep-1
+++ b/gettext-tools/tests/xgettext-librep-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lr-1.tmp xg-lr-1.jl || exit 1
-LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || exit 1
+  -d xg-lr-1.tmp xg-lr-1.jl || Exit 1
+LC_ALL=C tr -d '\r' < xg-lr-1.tmp.po > xg-lr-1.po || Exit 1
 
 cat <<EOF > xg-lr-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-librep-2 b/gettext-tools/tests/xgettext-librep-2
index f4dc918..7397a08 100755
--- a/gettext-tools/tests/xgettext-librep-2
+++ b/gettext-tools/tests/xgettext-librep-2
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-lr-2.tmp xg-lr-2.jl || exit 1
-LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || exit 1
+  -d xg-lr-2.tmp xg-lr-2.jl || Exit 1
+LC_ALL=C tr -d '\r' < xg-lr-2.tmp.po > xg-lr-2.po || Exit 1
 
 cat <<EOF > xg-lr-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-lisp-1 b/gettext-tools/tests/xgettext-lisp-1
index eb83e72..acbf3c5 100755
--- a/gettext-tools/tests/xgettext-lisp-1
+++ b/gettext-tools/tests/xgettext-lisp-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ls-1.tmp xg-ls-1.lisp || exit 1
-LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || exit 1
+  -d xg-ls-1.tmp xg-ls-1.lisp || Exit 1
+LC_ALL=C tr -d '\r' < xg-ls-1.tmp.po > xg-ls-1.po || Exit 1
 
 cat <<EOF > xg-ls-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-lisp-2 b/gettext-tools/tests/xgettext-lisp-2
index 94de068..434336a 100755
--- a/gettext-tools/tests/xgettext-lisp-2
+++ b/gettext-tools/tests/xgettext-lisp-2
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-ls-2.tmp xg-ls-2.lisp || exit 1
-LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || exit 1
+  -d xg-ls-2.tmp xg-ls-2.lisp || Exit 1
+LC_ALL=C tr -d '\r' < xg-ls-2.tmp.po > xg-ls-2.po || Exit 1
 
 cat <<EOF > xg-ls-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-lua-1 b/gettext-tools/tests/xgettext-lua-1
index 6a764c9..a41c313 100755
--- a/gettext-tools/tests/xgettext-lua-1
+++ b/gettext-tools/tests/xgettext-lua-1
@@ -26,8 +26,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lu-1.tmp xg-lu-1.lua || exit 1
-LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || exit 1
+  -d xg-lu-1.tmp xg-lu-1.lua || Exit 1
+LC_ALL=C tr -d '\r' < xg-lu-1.tmp.po > xg-lu-1.po || Exit 1
 
 cat <<EOF > xg-lu-1.ok
 msgid "This is a test string."
diff --git a/gettext-tools/tests/xgettext-lua-2 b/gettext-tools/tests/xgettext-lua-2
index 797e513..26eac14 100755
--- a/gettext-tools/tests/xgettext-lua-2
+++ b/gettext-tools/tests/xgettext-lua-2
@@ -25,8 +25,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-lu-2.tmp xg-lu-2.lua || exit 1
-LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || exit 1
+  -d xg-lu-2.tmp xg-lu-2.lua || Exit 1
+LC_ALL=C tr -d '\r' < xg-lu-2.tmp.po > xg-lu-2.po || Exit 1
 
 cat <<EOF > xg-lu-2.ok
 msgid "Hmm."
diff --git a/gettext-tools/tests/xgettext-objc-1 b/gettext-tools/tests/xgettext-objc-1
index 9563d77..9d34c13 100755
--- a/gettext-tools/tests/xgettext-objc-1
+++ b/gettext-tools/tests/xgettext-objc-1
@@ -26,8 +26,8 @@ NSLocalizedString(@"Information", @"")
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m || exit 1
-LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po || exit 1
+${XGETTEXT} --omit-header -k_ -kNSLocalizedString -d xg-ob-1.tmp xg-ob-1.m || Exit 1
+LC_ALL=C tr -d '\r' < xg-ob-1.tmp.po > xg-ob-1.po || Exit 1
 
 cat <<\EOF > xg-ob-1.ok
 #: xg-ob-1.m:2
diff --git a/gettext-tools/tests/xgettext-objc-2 b/gettext-tools/tests/xgettext-objc-2
index a59a3d4..21d174c 100755
--- a/gettext-tools/tests/xgettext-objc-2
+++ b/gettext-tools/tests/xgettext-objc-2
@@ -26,8 +26,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ob-2.tmp xg-ob-2.m || exit 1
-LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || exit 1
+  -d xg-ob-2.tmp xg-ob-2.m || Exit 1
+LC_ALL=C tr -d '\r' < xg-ob-2.tmp.po > xg-ob-2.po || Exit 1
 
 cat <<EOF > xg-ob-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-perl-1 b/gettext-tools/tests/xgettext-perl-1
index 5f52c60..1f9c9bf 100755
--- a/gettext-tools/tests/xgettext-perl-1
+++ b/gettext-tools/tests/xgettext-perl-1
@@ -154,8 +154,8 @@ ${XGETTEXT} --omit-header -n \
   -k_ --flag=_:1:pass-perl-format --flag=_:1:pass-perl-brace-format \
   -k%__ --flag=%__:1:pass-perl-format --flag=%__:1:pass-perl-brace-format \
   -k\$__ --flag=\$__:1:pass-perl-format --flag=\$__:1:pass-perl-brace-format \
-  -d xg-pl-1.tmp xg-pl-1.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po || exit 1
+  -d xg-pl-1.tmp xg-pl-1.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-1.tmp.po > xg-pl-1.po || Exit 1
 
 cat <<\EOF > xg-pl-1.ok
 #: xg-pl-1.pl:9
diff --git a/gettext-tools/tests/xgettext-perl-2 b/gettext-tools/tests/xgettext-perl-2
index 85f0464..e6f2ee7 100755
--- a/gettext-tools/tests/xgettext-perl-2
+++ b/gettext-tools/tests/xgettext-perl-2
@@ -14,7 +14,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=ISO-8859-1 xg-pl-2.pl \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-2.po || Exit 1
 
 cat <<\EOF > xg-pl-2.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-perl-3 b/gettext-tools/tests/xgettext-perl-3
index 9852813..01f5a77 100755
--- a/gettext-tools/tests/xgettext-perl-3
+++ b/gettext-tools/tests/xgettext-perl-3
@@ -14,7 +14,7 @@ EOF
 : ${XGETTEXT=xgettext}
 # delete POT-Creation-Date: line because the date depends on local time.
 ${XGETTEXT} --output - --from-code=UTF-8 xg-pl-3.pl \
-  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po || exit 1
+  | sed '/\"POT-Creation-Date:.*/d' | LC_ALL=C tr -d '\r' > xg-pl-3.po || Exit 1
 
 cat <<\EOF > xg-pl-3.ok
 # SOME DESCRIPTIVE TITLE.
diff --git a/gettext-tools/tests/xgettext-perl-4 b/gettext-tools/tests/xgettext-perl-4
index 1d4701f..09b9322 100755
--- a/gettext-tools/tests/xgettext-perl-4
+++ b/gettext-tools/tests/xgettext-perl-4
@@ -56,8 +56,8 @@ EOPERL
 
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot || exit 1
+${XGETTEXT} -a --omit-header --no-location -o xg-pl-4.tmp.pot xg-pl-4.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-4.tmp.pot > xg-pl-4.pot || Exit 1
 
 cat <<\EOF > xg-pl-4.ok
 msgid "'Your command, please?', asked the waiter.\n"
diff --git a/gettext-tools/tests/xgettext-perl-5 b/gettext-tools/tests/xgettext-perl-5
index 5020baf..cc83907 100755
--- a/gettext-tools/tests/xgettext-perl-5
+++ b/gettext-tools/tests/xgettext-perl-5
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-pl-5.tmp xg-pl-5.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || exit 1
+  -d xg-pl-5.tmp xg-pl-5.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-5.tmp.po > xg-pl-5.po || Exit 1
 
 cat <<EOF > xg-pl-5.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-perl-6 b/gettext-tools/tests/xgettext-perl-6
index 2347b11..e0abad6 100755
--- a/gettext-tools/tests/xgettext-perl-6
+++ b/gettext-tools/tests/xgettext-perl-6
@@ -65,8 +65,8 @@ EOPERL
 
 : ${XGETTEXT=xgettext}
 LC_MESSAGES=C LC_ALL= \
-${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot || exit 1
+${XGETTEXT} --omit-header --no-location -o xg-pl-6.tmp xg-pl-6.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-6.tmp > xg-pl-6.pot || Exit 1
 
 cat <<\EOF > xg-pl-6.ok
 msgid "extracted1"
diff --git a/gettext-tools/tests/xgettext-perl-7 b/gettext-tools/tests/xgettext-perl-7
index b170394..6918587 100755
--- a/gettext-tools/tests/xgettext-perl-7
+++ b/gettext-tools/tests/xgettext-perl-7
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-pl-7.tmp xg-pl-7.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || exit 1
+  -d xg-pl-7.tmp xg-pl-7.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-7.tmp.po > xg-pl-7.po || Exit 1
 
 cat <<EOF > xg-pl-7.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-perl-8 b/gettext-tools/tests/xgettext-perl-8
index f45aff8..b165e09 100755
--- a/gettext-tools/tests/xgettext-perl-8
+++ b/gettext-tools/tests/xgettext-perl-8
@@ -63,8 +63,8 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
   -k__ \
-  -d xg-pl-8.tmp xg-pl-8.pl || exit 1
-LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po || exit 1
+  -d xg-pl-8.tmp xg-pl-8.pl || Exit 1
+LC_ALL=C tr -d '\r' < xg-pl-8.tmp.po > xg-pl-8.po || Exit 1
 
 cat <<\EOF > xg-pl-8.ok
 #: xg-pl-8.pl:1
diff --git a/gettext-tools/tests/xgettext-php-1 b/gettext-tools/tests/xgettext-php-1
index deca6e0..09338ae 100755
--- a/gettext-tools/tests/xgettext-php-1
+++ b/gettext-tools/tests/xgettext-php-1
@@ -24,8 +24,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-ph-1.tmp xg-ph-1.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po || exit 1
+  -d xg-ph-1.tmp xg-ph-1.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-1.tmp.po > xg-ph-1.po || Exit 1
 
 cat <<EOF > xg-ph-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-php-2 b/gettext-tools/tests/xgettext-php-2
index 34f2e7f..3eb6a92 100755
--- a/gettext-tools/tests/xgettext-php-2
+++ b/gettext-tools/tests/xgettext-php-2
@@ -40,22 +40,22 @@ echo _("Franks");
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || Exit 1
 
-sed 's!<<<EOTMARKER!<<<"EOTMARKER"!' xg-ph-2.php > xg-ph-2d.php || exit 1
-sed "s!<<<EOTMARKER!<<<'EOTMARKER'!" xg-ph-2.php > xg-ph-2s.php || exit 1
+sed 's!<<<EOTMARKER!<<<"EOTMARKER"!' xg-ph-2.php > xg-ph-2d.php || Exit 1
+sed "s!<<<EOTMARKER!<<<'EOTMARKER'!" xg-ph-2.php > xg-ph-2s.php || Exit 1
 
 : ${XGETTEXT=xgettext}
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2.tmp xg-ph-2.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2.tmp.po > xg-ph-2.po || Exit 1
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2d.tmp xg-ph-2d.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2d.tmp.po > xg-ph-2d.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2d.tmp xg-ph-2d.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2d.tmp.po > xg-ph-2d.po || Exit 1
 
-${XGETTEXT} --omit-header --no-location -d xg-ph-2s.tmp xg-ph-2s.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-2s.tmp.po > xg-ph-2s.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-ph-2s.tmp xg-ph-2s.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-2s.tmp.po > xg-ph-2s.po || Exit 1
 
 cat <<EOF > xg-ph-2.ok
 msgid "Egyptians"
diff --git a/gettext-tools/tests/xgettext-php-3 b/gettext-tools/tests/xgettext-php-3
index 888a3aa..0561395 100755
--- a/gettext-tools/tests/xgettext-php-3
+++ b/gettext-tools/tests/xgettext-php-3
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-ph-3.tmp xg-ph-3.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || exit 1
+  -d xg-ph-3.tmp xg-ph-3.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-3.tmp.po > xg-ph-3.po || Exit 1
 
 cat <<EOF > xg-ph-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-php-4 b/gettext-tools/tests/xgettext-php-4
index 8edb553..842ad31 100755
--- a/gettext-tools/tests/xgettext-php-4
+++ b/gettext-tools/tests/xgettext-php-4
@@ -16,8 +16,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --extract-all \
-  -d xg-ph-4.tmp xg-ph-4.php || exit 1
-LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po || exit 1
+  -d xg-ph-4.tmp xg-ph-4.php || Exit 1
+LC_ALL=C tr -d '\r' < xg-ph-4.tmp.po > xg-ph-4.po || Exit 1
 
 cat <<EOF > xg-ph-4.ok
 msgid "foobar"
diff --git a/gettext-tools/tests/xgettext-po-1 b/gettext-tools/tests/xgettext-po-1
index 1074e02..1d22136 100755
--- a/gettext-tools/tests/xgettext-po-1
+++ b/gettext-tools/tests/xgettext-po-1
@@ -44,8 +44,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
-  -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || exit 1
+  -d xg-po-1.tmp xg-po-1.in.po xg-po-1.c xg-po-1.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-po-1.tmp.po > xg-po-1.po || Exit 1
 
 cat <<EOF > xg-po-1.ok
 #: file1.c:199
diff --git a/gettext-tools/tests/xgettext-properties-1 b/gettext-tools/tests/xgettext-properties-1
index 1e51edd..1261944 100755
--- a/gettext-tools/tests/xgettext-properties-1
+++ b/gettext-tools/tests/xgettext-properties-1
@@ -41,8 +41,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header -n \
-  -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || exit 1
-LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || exit 1
+  -d xg-pr-1.tmp xg-pr-1.in.properties xg-pr-1.c xg-pr-1.cc || Exit 1
+LC_ALL=C tr -d '\r' < xg-pr-1.tmp.po > xg-pr-1.po || Exit 1
 
 cat <<EOF > xg-pr-1.ok
 #: file1.c:199
diff --git a/gettext-tools/tests/xgettext-python-1 b/gettext-tools/tests/xgettext-python-1
index ab87463..7a4194c 100755
--- a/gettext-tools/tests/xgettext-python-1
+++ b/gettext-tools/tests/xgettext-python-1
@@ -30,7 +30,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -o xg-py-1.tmp xg-py-1.py 2>xg-py-1.err
-test $? = 0 || { cat xg-py-1.err; exit 1; }
+test $? = 0 || { cat xg-py-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-py-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-1.pot
diff --git a/gettext-tools/tests/xgettext-python-2 b/gettext-tools/tests/xgettext-python-2
index 5f071d4..2b3d739 100755
--- a/gettext-tools/tests/xgettext-python-2
+++ b/gettext-tools/tests/xgettext-python-2
@@ -21,8 +21,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-py-2.tmp xg-py-2.py || exit 1
-LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || exit 1
+  -d xg-py-2.tmp xg-py-2.py || Exit 1
+LC_ALL=C tr -d '\r' < xg-py-2.tmp.po > xg-py-2.po || Exit 1
 
 cat <<EOF > xg-py-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-python-3 b/gettext-tools/tests/xgettext-python-3
index 3ac44d1..b004b09 100755
--- a/gettext-tools/tests/xgettext-python-3
+++ b/gettext-tools/tests/xgettext-python-3
@@ -45,36 +45,36 @@ EOF
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
   -d xg-py-3a xg-py-3a.py > /dev/null 2>&1
-test $? = 1 || { exit 1; }
+test $? = 1 || { Exit 1; }
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=euc-jp \
-  -o xg-py-3a.tmp xg-py-3a.py || exit 1
+  -o xg-py-3a.tmp xg-py-3a.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3a.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3a.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3a.pot
 
 : ${DIFF=diff}
-${DIFF} xg-py-3.ok xg-py-3a.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3a.pot || Exit 1
 
 # Verify that if the source file has a magic coding comment, xgettext succeeds.
 
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location \
-  -o xg-py-3b.tmp xg-py-3b.py || exit 1
+  -o xg-py-3b.tmp xg-py-3b.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3b.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3b.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3b.pot
 
-${DIFF} xg-py-3.ok xg-py-3b.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3b.pot || Exit 1
 
 # Verify that if the source file has a magic coding comment and a --from-code
 # option is given, the magic coding comment takes precedence over it.
 
 ${XGETTEXT} --add-comments=TRANSLATORS: --no-location --from-code=iso-8859-1 \
-  -o xg-py-3c.tmp xg-py-3b.py || exit 1
+  -o xg-py-3c.tmp xg-py-3b.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3c.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3c.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3c.pot
 
-${DIFF} xg-py-3.ok xg-py-3c.pot || exit 1
+${DIFF} xg-py-3.ok xg-py-3c.pot || Exit 1
 
 # Verify that backslashes in and second bytes with value 0x5C are correctly
 # distinguished in weird encodings like BIG5.
@@ -87,7 +87,7 @@ print gettext.gettext(u"
 EOF
 
 ${XGETTEXT} --add-comments=TRANSLATORS: \
-  -o xg-py-3d.tmp xg-py-3d.py || exit 1
+  -o xg-py-3d.tmp xg-py-3d.py || Exit 1
 # Don't simplify this to "grep ... < xg-py-3d.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-py-3d.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-py-3d.pot
@@ -120,6 +120,6 @@ msgid "枯!"
 msgstr ""
 EOF
 
-${DIFF} xg-py-3d.ok xg-py-3d.pot || exit 1
+${DIFF} xg-py-3d.ok xg-py-3d.pot || Exit 1
 
-exit 0
+Exit 0
diff --git a/gettext-tools/tests/xgettext-python-4 b/gettext-tools/tests/xgettext-python-4
index 49d1c12..e1f5cd5 100755
--- a/gettext-tools/tests/xgettext-python-4
+++ b/gettext-tools/tests/xgettext-python-4
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-py-4.tmp xg-py-4.py || exit 1
-LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || exit 1
+  -d xg-py-4.tmp xg-py-4.py || Exit 1
+LC_ALL=C tr -d '\r' < xg-py-4.tmp.po > xg-py-4.po || Exit 1
 
 cat <<EOF > xg-py-4.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-scheme-1 b/gettext-tools/tests/xgettext-scheme-1
index 4ecccae..576bb51 100755
--- a/gettext-tools/tests/xgettext-scheme-1
+++ b/gettext-tools/tests/xgettext-scheme-1
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sc-1.tmp xg-sc-1.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || exit 1
+  -d xg-sc-1.tmp xg-sc-1.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-1.tmp.po > xg-sc-1.po || Exit 1
 
 cat <<EOF > xg-sc-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-scheme-2 b/gettext-tools/tests/xgettext-scheme-2
index cc7b5bf..8c7fbb8 100755
--- a/gettext-tools/tests/xgettext-scheme-2
+++ b/gettext-tools/tests/xgettext-scheme-2
@@ -8,7 +8,7 @@ cat <<EOF > xg-sc-2.scm
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || exit 1
+${XGETTEXT} -k_ --omit-header --no-location --force-po -d xg-sc-2 xg-sc-2.scm || Exit 1
 
 cat <<EOF > xg-sc-2.ok
 EOF
diff --git a/gettext-tools/tests/xgettext-scheme-3 b/gettext-tools/tests/xgettext-scheme-3
index 96e821f..fe28ebb 100755
--- a/gettext-tools/tests/xgettext-scheme-3
+++ b/gettext-tools/tests/xgettext-scheme-3
@@ -15,8 +15,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-sc-3.tmp xg-sc-3.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || exit 1
+  -d xg-sc-3.tmp xg-sc-3.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-3.tmp.po > xg-sc-3.po || Exit 1
 
 cat <<EOF > xg-sc-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-scheme-4 b/gettext-tools/tests/xgettext-scheme-4
index 3566d6b..1851a46 100755
--- a/gettext-tools/tests/xgettext-scheme-4
+++ b/gettext-tools/tests/xgettext-scheme-4
@@ -19,8 +19,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -k_ --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sc-4.tmp xg-sc-4.scm || exit 1
-LC_ALL=C tr -d '\r' < xg-sc-4.tmp.po > xg-sc-4.po || exit 1
+  -d xg-sc-4.tmp xg-sc-4.scm || Exit 1
+LC_ALL=C tr -d '\r' < xg-sc-4.tmp.po > xg-sc-4.po || Exit 1
 
 cat <<EOF > xg-sc-4.ok
 msgid "New _Brush..."
diff --git a/gettext-tools/tests/xgettext-sh-1 b/gettext-tools/tests/xgettext-sh-1
index 28e2051..ea24931 100755
--- a/gettext-tools/tests/xgettext-sh-1
+++ b/gettext-tools/tests/xgettext-sh-1
@@ -464,8 +464,8 @@ EOF
 : ${XGETTEXT=xgettext}
 # Here we use ngettext with two signatures: ngettext:1 and ngettext:1,2.
 ${XGETTEXT} --omit-header --no-location --keyword=ngettext:1 \
-  -d xg-sh-1.tmp xg-sh-1.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po || exit 1
+  -d xg-sh-1.tmp xg-sh-1.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-1.tmp.po > xg-sh-1.po || Exit 1
 
 cat <<\EOF > xg-sh-1.ok
 msgid "depth_0_none_0_x"
diff --git a/gettext-tools/tests/xgettext-sh-2 b/gettext-tools/tests/xgettext-sh-2
index daf1c02..a4b7e8d 100755
--- a/gettext-tools/tests/xgettext-sh-2
+++ b/gettext-tools/tests/xgettext-sh-2
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-sh-2.tmp xg-sh-2.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || exit 1
+  -d xg-sh-2.tmp xg-sh-2.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-2.tmp.po > xg-sh-2.po || Exit 1
 
 cat <<EOF > xg-sh-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-sh-3 b/gettext-tools/tests/xgettext-sh-3
index e6cadfe..7f70b95 100755
--- a/gettext-tools/tests/xgettext-sh-3
+++ b/gettext-tools/tests/xgettext-sh-3
@@ -10,8 +10,8 @@ echo `gettext $'\'\"\a\b\e\f\n\r\t\v\x61\x3a\x3A\075\\'`
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-sh-3.tmp xg-sh-3.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-3.tmp.po > xg-sh-3.po || Exit 1
 
 cat <<\EOF > xg-sh-3.ok
 msgid "abc\\\"def"
diff --git a/gettext-tools/tests/xgettext-sh-4 b/gettext-tools/tests/xgettext-sh-4
index 7096d8c..dfd8399 100755
--- a/gettext-tools/tests/xgettext-sh-4
+++ b/gettext-tools/tests/xgettext-sh-4
@@ -115,8 +115,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location -d xg-sh-4.tmp xg-sh-4.sh 2>xg-sh-4.err
-test $? = 0 || { cat xg-sh-4.err; exit 1; }
-LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po || exit 1
+test $? = 0 || { cat xg-sh-4.err; Exit 1; }
+LC_ALL=C tr -d '\r' < xg-sh-4.tmp.po > xg-sh-4.po || Exit 1
 
 cat <<\EOF > xg-sh-4.ok
 msgid "depth_0_bashquote_0_x"
diff --git a/gettext-tools/tests/xgettext-sh-5 b/gettext-tools/tests/xgettext-sh-5
index 9daf65f..a5937b0 100755
--- a/gettext-tools/tests/xgettext-sh-5
+++ b/gettext-tools/tests/xgettext-sh-5
@@ -15,8 +15,8 @@ echo "$(gettext "Simple decorated dstring: \"x\" \\\"y\\\" inside double-quotes"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-sh-5.tmp xg-sh-5.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-5.tmp.po > xg-sh-5.po || Exit 1
 
 cat <<\EOF > xg-sh-5.ok
 msgid "Simple string"
diff --git a/gettext-tools/tests/xgettext-sh-6 b/gettext-tools/tests/xgettext-sh-6
index 0bc2eec..656781d 100755
--- a/gettext-tools/tests/xgettext-sh-6
+++ b/gettext-tools/tests/xgettext-sh-6
@@ -10,8 +10,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-sh-6.tmp xg-sh-6.sh || exit 1
-LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || exit 1
+  -d xg-sh-6.tmp xg-sh-6.sh || Exit 1
+LC_ALL=C tr -d '\r' < xg-sh-6.tmp.po > xg-sh-6.po || Exit 1
 
 cat <<EOF > xg-sh-6.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-smalltalk-1 b/gettext-tools/tests/xgettext-smalltalk-1
index 7c50834..b949380 100755
--- a/gettext-tools/tests/xgettext-smalltalk-1
+++ b/gettext-tools/tests/xgettext-smalltalk-1
@@ -18,8 +18,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-st-1.tmp xg-st-1.st || exit 1
-LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || exit 1
+  -d xg-st-1.tmp xg-st-1.st || Exit 1
+LC_ALL=C tr -d '\r' < xg-st-1.tmp.po > xg-st-1.po || Exit 1
 
 cat <<EOF > xg-st-1.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-smalltalk-2 b/gettext-tools/tests/xgettext-smalltalk-2
index 9814efa..01d61fa 100755
--- a/gettext-tools/tests/xgettext-smalltalk-2
+++ b/gettext-tools/tests/xgettext-smalltalk-2
@@ -14,8 +14,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location \
-  -d xg-st-2.tmp xg-st-2.st || exit 1
-LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || exit 1
+  -d xg-st-2.tmp xg-st-2.st || Exit 1
+LC_ALL=C tr -d '\r' < xg-st-2.tmp.po > xg-st-2.po || Exit 1
 
 cat <<EOF > xg-st-2.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-stringtable-1 b/gettext-tools/tests/xgettext-stringtable-1
index 4fd08fa..4bbe17a 100755
--- a/gettext-tools/tests/xgettext-stringtable-1
+++ b/gettext-tools/tests/xgettext-stringtable-1
@@ -21,7 +21,7 @@ add comments above this one
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || exit 1
+${XGETTEXT} -o xg-stbl-1.tmp xg-stbl-1.strings || Exit 1
 # Don't simplify this to "grep ... < xg-stbl-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-stbl-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-stbl-1.po
diff --git a/gettext-tools/tests/xgettext-tcl-1 b/gettext-tools/tests/xgettext-tcl-1
index 645e19a..2126318 100755
--- a/gettext-tools/tests/xgettext-tcl-1
+++ b/gettext-tools/tests/xgettext-tcl-1
@@ -23,7 +23,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-1.tmp xg-t-1.tcl 2>xg-t-1.err
-test $? = 0 || { cat xg-t-1.err; exit 1; }
+test $? = 0 || { cat xg-t-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-t-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-t-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-1.pot
diff --git a/gettext-tools/tests/xgettext-tcl-2 b/gettext-tools/tests/xgettext-tcl-2
index c087686..bbacdf8 100755
--- a/gettext-tools/tests/xgettext-tcl-2
+++ b/gettext-tools/tests/xgettext-tcl-2
@@ -17,8 +17,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: -k_ \
-  -d xg-t-2.tmp xg-t-2.tcl || exit 1
-LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || exit 1
+  -d xg-t-2.tmp xg-t-2.tcl || Exit 1
+LC_ALL=C tr -d '\r' < xg-t-2.tmp.po > xg-t-2.po || Exit 1
 
 cat <<EOF > xg-t-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-tcl-3 b/gettext-tools/tests/xgettext-tcl-3
index 2593e6a..fd60c74 100755
--- a/gettext-tools/tests/xgettext-tcl-3
+++ b/gettext-tools/tests/xgettext-tcl-3
@@ -11,8 +11,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-t-3.tmp xg-t-3.tcl || exit 1
-LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || exit 1
+  -d xg-t-3.tmp xg-t-3.tcl || Exit 1
+LC_ALL=C tr -d '\r' < xg-t-3.tmp.po > xg-t-3.po || Exit 1
 
 cat <<EOF > xg-t-3.ok
 #. a
diff --git a/gettext-tools/tests/xgettext-tcl-4 b/gettext-tools/tests/xgettext-tcl-4
index 336f477..ab6af3d 100755
--- a/gettext-tools/tests/xgettext-tcl-4
+++ b/gettext-tools/tests/xgettext-tcl-4
@@ -11,7 +11,7 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --no-location -k_ -o xg-t-4.tmp xg-t-4.tcl 2>xg-t-4.err
-test $? = 0 || { cat xg-t-4.err; exit 1; }
+test $? = 0 || { cat xg-t-4.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-t-4.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-t-4.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-t-4.pot
diff --git a/gettext-tools/tests/xgettext-vala-1 b/gettext-tools/tests/xgettext-vala-1
index 141a2de..8d3e8e3 100755
--- a/gettext-tools/tests/xgettext-vala-1
+++ b/gettext-tools/tests/xgettext-vala-1
@@ -10,7 +10,7 @@ int main (string[] args) {
   var r1 = /a
 EOF
 
-(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location -o - xg-vala-1.err.vala 2>&1; exit) | grep 'regular expression literal terminated too early' || exit 1
+(LANGUAGE= LC_ALL=C ${XGETTEXT} --no-location -o - xg-vala-1.err.vala 2>&1; exit) | grep 'regular expression literal terminated too early' || Exit 1
 
 cat <<\EOF > xg-vala-1.vala
 int main (string[] args) {
@@ -92,7 +92,7 @@ class Foo : Object {
 EOF
 
 ${XGETTEXT} --add-comments --no-location -o xg-vala-1.tmp xg-vala-1.vala 2>xg-vala-1.err
-test $? = 0 || { cat xg-vala-1.err; exit 1; }
+test $? = 0 || { cat xg-vala-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
@@ -148,7 +148,7 @@ test $result = 0 || exit $result
 
 # Test --extract-all option.
 ${XGETTEXT} --extract-all --add-comments --no-location -o xg-vala-1.tmp xg-vala-1.vala 2>xg-vala-1.err
-test $? = 0 || { cat xg-vala-1.err; exit 1; }
+test $? = 0 || { cat xg-vala-1.err; Exit 1; }
 # Don't simplify this to "grep ... < xg-vala-1.tmp", otherwise OpenBSD 4.0 grep
 # only outputs "Binary file (standard input) matches".
 cat xg-vala-1.tmp | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r' > xg-vala-1.pot
diff --git a/gettext-tools/tests/xgettext-ycp-1 b/gettext-tools/tests/xgettext-ycp-1
index b6d4348..72eef7c 100755
--- a/gettext-tools/tests/xgettext-ycp-1
+++ b/gettext-tools/tests/xgettext-ycp-1
@@ -9,8 +9,8 @@ title = sformat (_("%1 package", "%1 packages", num), num);
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || exit 1
+${XGETTEXT} --omit-header --no-location -k:1,2 -d xg-y-1.tmp xg-y-1.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-1.tmp.po > xg-y-1.po || Exit 1
 
 cat <<EOF > xg-y-1.ok
 #, ycp-format
diff --git a/gettext-tools/tests/xgettext-ycp-2 b/gettext-tools/tests/xgettext-ycp-2
index b5ea282..b8bb5a7 100755
--- a/gettext-tools/tests/xgettext-ycp-2
+++ b/gettext-tools/tests/xgettext-ycp-2
@@ -20,8 +20,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --omit-header --no-location --add-comments=TRANSLATORS: \
-  -d xg-y-2.tmp xg-y-2.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || exit 1
+  -d xg-y-2.tmp xg-y-2.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-2.tmp.po > xg-y-2.po || Exit 1
 
 cat <<EOF > xg-y-2.ok
 msgid "help"
diff --git a/gettext-tools/tests/xgettext-ycp-3 b/gettext-tools/tests/xgettext-ycp-3
index 6325db6..bb0f014 100755
--- a/gettext-tools/tests/xgettext-ycp-3
+++ b/gettext-tools/tests/xgettext-ycp-3
@@ -11,8 +11,8 @@ print (_("John\n"
 EOF
 
 : ${XGETTEXT=xgettext}
-${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po || exit 1
+${XGETTEXT} --omit-header --no-location -d xg-y-3.tmp xg-y-3.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-3.tmp.po > xg-y-3.po || Exit 1
 
 cat <<\EOF > xg-y-3.ok
 msgid ""
diff --git a/gettext-tools/tests/xgettext-ycp-4 b/gettext-tools/tests/xgettext-ycp-4
index 6a958ee..d9fb173 100755
--- a/gettext-tools/tests/xgettext-ycp-4
+++ b/gettext-tools/tests/xgettext-ycp-4
@@ -12,8 +12,8 @@ EOF
 
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} --add-comments --omit-header --no-location --keyword=_ \
-  -d xg-y-4.tmp xg-y-4.ycp || exit 1
-LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || exit 1
+  -d xg-y-4.tmp xg-y-4.ycp || Exit 1
+LC_ALL=C tr -d '\r' < xg-y-4.tmp.po > xg-y-4.po || Exit 1
 
 cat <<EOF > xg-y-4.ok
 #. a
-- 
cgit v1.1