Explain why tests are skipped.

41 files changed, 417 insertions, 81 deletions

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 8b54fab..f29f8fa 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,49 @@
+2006-06-03  Bruno Haible  <bruno@clisp.org>
+
+	Explain why tests are skipped.
+	* Makefile.am (TESTS_ENVIRONMENT): Also define JAVA_CHOICE, BUILDJAVA,
+	CSHARPCHOICE, BUILDCSHARP.
+	* testlocale.c (main): Don't print "Couldn't set locale.".
+	* format-c-5-prg.c (main): Likewise.
+	* format-c-5: Print a message explaining why the test is skipped.
+	* gettext-3: Likewise.
+	* gettext-4: Likewise.
+	* gettext-5: Likewise.
+	* gettext-6: Likewise.
+	* gettext-7: Likewise.
+	* lang-bash: Likewise.
+	* lang-clisp: Likewise.
+	* lang-csharp: Likewise.
+	* lang-gawk: Likewise.
+	* lang-guile: Likewise.
+	* lang-java: Likewise.
+	* lang-librep: Likewise.
+	* lang-pascal: Likewise.
+	* lang-perl-1: Likewise.
+	* lang-perl-2: Likewise.
+	* lang-php: Likewise.
+	* lang-python-1: Likewise.
+	* lang-python-2: Likewise.
+	* lang-sh: Likewise.
+	* lang-smalltalk: Likewise.
+	* lang-tcl: Likewise.
+	* msgfilter-1: Likewise.
+	* msgfilter-2: Likewise.
+	* msgfilter-3: Likewise.
+	* msgfilter-4: Likewise.
+	* msgunfmt-csharp-1: Likewise.
+	* msgunfmt-java-1: Likewise.
+	* msgunfmt-tcl-1: Likewise.
+	* recode-sr-latin-1: Likewise.
+	* recode-sr-latin-2: Likewise.
+	* xgettext-glade-1: Likewise.
+	* xgettext-glade-2: Likewise.
+	* xgettext-glade-3: Likewise.
+	* lang-c: Print a message explaining why the test is skipped. Don't
+	print "Couldn't set locale.".
+	* lang-c++: Likewise.
+	* lang-objc: Likewise.
+
 2006-05-31  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext-ycp-3: New file, from Karl Eichwalder <ke@suse.de>.
diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 8b6529e..92c162d 100644
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -159,7 +159,11 @@ TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) \
 		    CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' \
 		    CPPFLAGS='@CPPFLAGS@' LDFLAGS='@LDFLAGS@' \
 		    LTLIBINTL='@LTLIBINTL@' \
+		    JAVA_CHOICE='@JAVA_CHOICE@' \
+		    BUILDJAVA='@BUILDJAVA@' \
 		    TESTJAVA='@TESTJAVA@' \
+		    CSHARP_CHOICE='@CSHARP_CHOICE@' \
+		    BUILDCSHARP='@BUILDCSHARP@' \
 		    TESTCSHARP='@TESTCSHARP@' \
 		    TESTLIBASPRINTF='@TESTLIBASPRINTF@' \
 		    LOCALE_FR='@LOCALE_FR@' \
diff --git a/gettext-tools/tests/format-c-5 b/gettext-tools/tests/format-c-5
index 8b9b252..00077af 100755
--- a/gettext-tools/tests/format-c-5
+++ b/gettext-tools/tests/format-c-5
@@ -47,7 +47,13 @@ ${DIFF} fa.po.strip fa.po.tmp || exit 1
 LANGUAGE= ./fc5 fa_IR
 case $? in
   0) ;;
-  77) rm -fr $tmpfiles; exit 77;;
+  77)
+    if test -f /usr/bin/localedef; then
+      echo "Skipping test: locale fa_IR not installed"
+    else
+      echo "Skipping test: locale fa_IR not supported"
+    fi
+    rm -fr $tmpfiles; exit 77;;
   *) exit 1;;
 esac
 
diff --git a/gettext-tools/tests/format-c-5-prg.c b/gettext-tools/tests/format-c-5-prg.c
index bc477e8..3ebb2f6 100644
--- a/gettext-tools/tests/format-c-5-prg.c
+++ b/gettext-tools/tests/format-c-5-prg.c
@@ -1,5 +1,5 @@
 /* Test program, used by the format-c-5 test.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -48,10 +48,8 @@ main (int argc, char *argv[])
 
   xsetenv ("LC_ALL", argv[1], 1);
   if (setlocale (LC_ALL, "") == NULL)
-    {
-      fprintf (stderr, "Couldn't set locale.\n");
-      exit (77);
-    }
+    /* Couldn't set locale.  */
+    exit (77);
 
   textdomain ("fc5");
   bindtextdomain ("fc5", ".");
diff --git a/gettext-tools/tests/gettext-3 b/gettext-tools/tests/gettext-3
index b45f5ce..f7f7e62 100755
--- a/gettext-tools/tests/gettext-3
+++ b/gettext-tools/tests/gettext-3
@@ -7,11 +7,28 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || exit 77
+grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+  echo "Skipping test: not a glibc system"
+  exit 77
+}
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ./testlocale || exit 77
-LC_ALL=fr_FR ./testlocale || exit 77
+LC_ALL=de_DE ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE not installed"
+  else
+    echo "Skipping test: locale de_DE not supported"
+  fi
+  exit 77
+}
+LC_ALL=fr_FR ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale fr_FR not installed"
+  else
+    echo "Skipping test: locale fr_FR not supported"
+  fi
+  exit 77
+}
 
 tmpfiles="$tmpfiles de_DE fr_FR"
 test -d de_DE || mkdir de_DE
diff --git a/gettext-tools/tests/gettext-4 b/gettext-tools/tests/gettext-4
index aa3332b..f70eb18 100755
--- a/gettext-tools/tests/gettext-4
+++ b/gettext-tools/tests/gettext-4
@@ -6,7 +6,14 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on systems that have a de_DE.ISO-8859-1 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ./testlocale || exit 77
+LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
+  else
+    echo "Skipping test: locale de_DE.ISO-8859-1 not supported"
+  fi
+  exit 77
+}
 
 tmpfiles="$tmpfiles de_DE"
 test -d de_DE || mkdir de_DE
diff --git a/gettext-tools/tests/gettext-5 b/gettext-tools/tests/gettext-5
index beda928..955b1a4 100755
--- a/gettext-tools/tests/gettext-5
+++ b/gettext-tools/tests/gettext-5
@@ -7,12 +7,29 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || exit 77
+grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+  echo "Skipping test: not a glibc system"
+  exit 77
+}
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ./testlocale || exit 77
-LC_ALL=de_DE.UTF-8      ./testlocale || exit 77
+LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
+  else
+    echo "Skipping test: locale de_DE.ISO-8859-1 not supported"
+  fi
+  exit 77
+}
+LC_ALL=de_DE.UTF-8 ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE.UTF-8 not installed"
+  else
+    echo "Skipping test: locale de_DE.UTF-8 not supported"
+  fi
+  exit 77
+}
 
 tmpfiles="$tmpfiles de_DE"
 test -d de_DE || mkdir de_DE
diff --git a/gettext-tools/tests/gettext-6 b/gettext-tools/tests/gettext-6
index f029aeb..dd56c62 100755
--- a/gettext-tools/tests/gettext-6
+++ b/gettext-tools/tests/gettext-6
@@ -8,11 +8,28 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || exit 77
+grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+  echo "Skipping test: not a glibc system"
+  exit 77
+}
 
 # This test works only on systems that have a de_DE and fr_FR locale installed.
-LC_ALL=de_DE ./testlocale || exit 77
-LC_ALL=fr_FR ./testlocale || exit 77
+LC_ALL=de_DE ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE not installed"
+  else
+    echo "Skipping test: locale de_DE not supported"
+  fi
+  exit 77
+}
+LC_ALL=fr_FR ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale fr_FR not installed"
+  else
+    echo "Skipping test: locale fr_FR not supported"
+  fi
+  exit 77
+}
 
 tmpfiles="$tmpfiles de_DE fr_FR"
 test -d de_DE || mkdir de_DE
diff --git a/gettext-tools/tests/gettext-7 b/gettext-tools/tests/gettext-7
index 2ff145c..598ee8c 100755
--- a/gettext-tools/tests/gettext-7
+++ b/gettext-tools/tests/gettext-7
@@ -8,12 +8,29 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # This test works only on glibc systems.
-grep '@GLIBC2@.*yes' ../config.status >/dev/null || exit 77
+grep '@GLIBC2@.*yes' ../config.status >/dev/null || {
+  echo "Skipping test: not a glibc system"
+  exit 77
+}
 
 # This test works only on systems that have a de_DE.ISO-8859-1 and
 # de_DE.UTF-8 locale installed.
-LC_ALL=de_DE.ISO-8859-1 ./testlocale || exit 77
-LC_ALL=de_DE.UTF-8      ./testlocale || exit 77
+LC_ALL=de_DE.ISO-8859-1 ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE.ISO-8859-1 not installed"
+  else
+    echo "Skipping test: locale de_DE.ISO-8859-1 not supported"
+  fi
+  exit 77
+}
+LC_ALL=de_DE.UTF-8 ./testlocale || {
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: locale de_DE.UTF-8 not installed"
+  else
+    echo "Skipping test: locale de_DE.UTF-8 not supported"
+  fi
+  exit 77
+}
 
 tmpfiles="$tmpfiles de_DE"
 test -d de_DE || mkdir de_DE
diff --git a/gettext-tools/tests/lang-bash b/gettext-tools/tests/lang-bash
index f9397b0..4700a0e 100755
--- a/gettext-tools/tests/lang-bash
+++ b/gettext-tools/tests/lang-bash
@@ -83,10 +83,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: bash not found"; rm -fr $tmpfiles; exit 77; }
 case `bash -c 'echo $BASH_VERSION'` in
   [2-9].*) ;;
-  *) rm -fr $tmpfiles; exit 77;;
+  *) echo "Skipping test: bash version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -109,6 +109,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
@@ -133,13 +138,19 @@ EOF
 if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR bash ./prog.sh 2 > prog.out || exit 1
   : ${DIFF=diff}
-  ${DIFF} prog.nok prog.out > /dev/null && { rm -fr $tmpfiles; exit 77; }
+  ${DIFF} prog.nok prog.out > /dev/null && {
+    echo "Skipping test: bash is built without i18n support"
+    rm -fr $tmpfiles; exit 77
+  }
   ${DIFF} prog.ok prog.out || exit 1
 fi
 if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 bash ./prog.sh 2 > prog.out || exit 1
   : ${DIFF=diff}
-  ${DIFF} prog.nok prog.out > /dev/null && { rm -fr $tmpfiles; exit 77; }
+  ${DIFF} prog.nok prog.out > /dev/null && {
+    echo "Skipping test: bash is built without i18n support"
+    rm -fr $tmpfiles; exit 77
+  }
   ${DIFF} prog.oku prog.out || exit 1
 fi
 
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index 46c3bf5..e341b99 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -23,10 +23,8 @@ int main (int argc, char *argv[])
 
   xsetenv ("LC_ALL", argv[1], 1);
   if (setlocale (LC_ALL, "") == NULL)
-    {
-      fprintf (stderr, "Couldn't set locale.\n");
-      exit (77);
-    }
+    /* Couldn't set locale.  */
+    exit (77);
 
   textdomain ("prog");
   bindtextdomain ("prog", ".");
@@ -148,6 +146,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 7e4892e..af96ecf 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -8,8 +8,14 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether a C++ compiler is found and libasprintf is built.
-test "${CXX}" != ":" || exit 77
-test "${TESTLIBASPRINTF}" = yes || exit 77
+test "${CXX}" != ":" || {
+  echo "Skipping test: no C++ compiler found"
+  exit 77
+}
+test "${TESTLIBASPRINTF}" = yes || {
+  echo "Skipping test: configured with --disable-libasprintf"
+  exit 77
+}
 
 tmpfiles="$tmpfiles prog.cc"
 cat <<\EOF > prog.cc
@@ -38,10 +44,8 @@ int main (int argc, char *argv[])
 
   xsetenv ("LC_ALL", argv[1], 1);
   if (setlocale (LC_ALL, "") == NULL)
-    {
-      cerr << "Couldn't set locale." << endl;
-      exit (77);
-    }
+    // Couldn't set locale.
+    exit (77);
 
   textdomain ("prog");
   bindtextdomain ("prog", ".");
@@ -161,6 +165,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index dcd8b88..b01b36a 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -85,16 +85,18 @@ ${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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: clisp not found"; rm -fr $tmpfiles; exit 77; }
 version=`clisp --version | sed -n -e 1p | sed -e 's/^[^0-9]*//'`
 case $version in
   19* | 20*) # older than 2.25
-    rm -fr $tmpfiles; exit 77;;
+    echo "Skipping test: clisp version too old"; rm -fr $tmpfiles; 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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: clisp was built without gettext support"
+       rm -fr $tmpfiles; exit 77
+     }
 
 # Test which of the fr_FR locales are installed.
 : ${LOCALE_FR=fr_FR}
@@ -116,6 +118,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-csharp b/gettext-tools/tests/lang-csharp
index 27a4c86..b4e3276 100755
--- a/gettext-tools/tests/lang-csharp
+++ b/gettext-tools/tests/lang-csharp
@@ -12,7 +12,18 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can build and test C# programs.
-test "${TESTCSHARP}" = yes || exit 77
+test "${CSHARP_CHOICE}" != no || {
+  echo "Skipping test: configured with --disable-csharp"
+  exit 77
+}
+test "${BUILDCSHARP}" = yes || {
+  echo "Skipping test: C# compiler not found"
+  exit 77
+}
+test "${TESTCSHARP}" = yes || {
+  echo "Skipping test: C# engine not found"
+  exit 77
+}
 
 tmpfiles="$tmpfiles program.cs"
 cat <<\EOF > program.cs
@@ -118,6 +129,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index cafa366..20b2361 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -87,10 +87,10 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 
 # Test for presence of gawk version 3.1.1 or newer.
 (gawk --version) >/dev/null 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: gawk not found"; rm -fr $tmpfiles; exit 77; }
 case `gawk --version 2>&1 | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.* | 3.0* | 3.1.0*)
-    rm -fr $tmpfiles; exit 77;;
+    echo "Skipping test: gawk version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -113,6 +113,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
@@ -121,11 +126,17 @@ fi
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR gawk --version | grep logiciel > /dev/null
-  test $? = 0 || { rm -fr $tmpfiles; exit 77; }
+  test $? = 0 || {
+    echo "Skipping test: gawk was built without i18n support"
+    rm -fr $tmpfiles; exit 77
+  }
 fi
 if test $LOCALE_FR_UTF8 != none; then
   LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 gawk --version | grep logiciel > /dev/null
-  test $? = 0 || { rm -fr $tmpfiles; exit 77; }
+  test $? = 0 || {
+    echo "Skipping test: gawk was built without i18n support"
+    rm -fr $tmpfiles; exit 77
+  }
 fi
 
 tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
diff --git a/gettext-tools/tests/lang-guile b/gettext-tools/tests/lang-guile
index 79c9495..deef895 100755
--- a/gettext-tools/tests/lang-guile
+++ b/gettext-tools/tests/lang-guile
@@ -86,10 +86,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: guile not found"; rm -fr $tmpfiles; exit 77; }
 case `guile --version | sed -e 1q | sed -e 's/^[^0-9]*//'` in
   0.* | 1.[0-6] | 1.[0-6].* )
-    rm -fr $tmpfiles; exit 77;;
+    echo "Skipping test: guile version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -112,6 +112,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index 68ece19..c47928d 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -11,7 +11,18 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can build and test Java programs.
-test "${TESTJAVA}" = yes || exit 77
+test "${JAVA_CHOICE}" != no || {
+  echo "Skipping test: configured with --disable-java"
+  exit 77
+}
+test "${BUILDJAVA}" = yes || {
+  echo "Skipping test: Java compiler or jar not found"
+  exit 77
+}
+test "${TESTJAVA}" = yes || {
+  echo "Skipping test: Java engine not found"
+  exit 77
+}
 
 tmpfiles="$tmpfiles Program.java"
 cat <<\EOF > Program.java
@@ -141,6 +152,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index 5b8840a..75efcf2 100755
--- a/gettext-tools/tests/lang-librep
+++ b/gettext-tools/tests/lang-librep
@@ -69,10 +69,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: rep not found"; rm -fr $tmpfiles; 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] )
-    rm -fr $tmpfiles; exit 77;;
+    echo "Skipping test: rep version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -95,6 +95,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 2ab2b3f..16e3a77 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -19,7 +19,9 @@ int main ()
 }
 EOF
 ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hello hello.m 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: Objective C compiler not found"
+       rm -fr $tmpfiles; exit 77
+     }
 
 tmpfiles="$tmpfiles prog.m"
 cat <<\EOF > prog.m
@@ -37,10 +39,8 @@ int main (int argc, char *argv[])
 
   xsetenv ("LC_ALL", argv[1], 1);
   if (setlocale (LC_ALL, "") == NULL)
-    {
-      fprintf (stderr, "Couldn't set locale.\n");
-      exit (77);
-    }
+    /* Couldn't set locale.  */
+    exit (77);
 
   textdomain ("prog");
   bindtextdomain ("prog", ".");
@@ -162,6 +162,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 46cb24a..4c58581 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -30,7 +30,10 @@ end.
 EOF
 
 tmpfiles="$tmpfiles prog.o prog.rst prog"
-(ppc386 prog.pp) >/dev/null 2>&1 || { rm -fr $tmpfiles; exit 77; }
+(ppc386 prog.pp) >/dev/null 2>&1 || {
+  echo "Skipping test: ppc386 compiler not found"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles prog.pot"
 : ${XGETTEXT=xgettext}
@@ -105,6 +108,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-perl-1 b/gettext-tools/tests/lang-perl-1
index ccd2d85..fc3ed89 100755
--- a/gettext-tools/tests/lang-perl-1
+++ b/gettext-tools/tests/lang-perl-1
@@ -101,7 +101,9 @@ EOF
 
 # Test for perl with Locale::Messages package.
 perl -e 'use Locale::Messages;' 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: perl package Locale::Messages is not installed"
+       rm -fr $tmpfiles; exit 77
+     }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
@@ -114,6 +116,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-perl-2 b/gettext-tools/tests/lang-perl-2
index 940aaee..af305ef 100755
--- a/gettext-tools/tests/lang-perl-2
+++ b/gettext-tools/tests/lang-perl-2
@@ -100,7 +100,9 @@ EOF
 
 # Test for perl with libintl-perl package.
 perl -M'Locale::TextDomain' -e '' 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: perl package libintl-perl is not installed"
+       rm -fr $tmpfiles; exit 77
+     }
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
@@ -113,6 +115,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 77de6ce..987274c 100755
--- a/gettext-tools/tests/lang-php
+++ b/gettext-tools/tests/lang-php
@@ -68,7 +68,7 @@ ${MSGFMT} -o fr/LC_MESSAGES/prog.mo fr.po
 # Test for presence of php version 4.0 or newer.
 case `(php -v) 2>/dev/null` in
   [4-9].*) ;;
-  *) rm -fr $tmpfiles; exit 77;;
+  *) echo "Skipping test: php not found or too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test which of the fr_FR locales are installed.
@@ -91,6 +91,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-python-1 b/gettext-tools/tests/lang-python-1
index 40b686e..7d38235 100755
--- a/gettext-tools/tests/lang-python-1
+++ b/gettext-tools/tests/lang-python-1
@@ -70,10 +70,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: python not found"; rm -fr $tmpfiles; exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20000F0'` in
   1 | True) ;;
-  *) rm -fr $tmpfiles; exit 77;;
+  *) echo "Skipping test: python version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
@@ -98,6 +98,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-python-2 b/gettext-tools/tests/lang-python-2
index 70f889a..b1e10c7 100755
--- a/gettext-tools/tests/lang-python-2
+++ b/gettext-tools/tests/lang-python-2
@@ -89,10 +89,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: python not found"; rm -fr $tmpfiles; exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20300F0'` in
   1 | True) ;;
-  *) rm -fr $tmpfiles; exit 77;;
+  *) echo "Skipping test: python version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
@@ -119,6 +119,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-sh b/gettext-tools/tests/lang-sh
index baca02a..76c878f 100755
--- a/gettext-tools/tests/lang-sh
+++ b/gettext-tools/tests/lang-sh
@@ -99,6 +99,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 31ff305..7308428 100755
--- a/gettext-tools/tests/lang-smalltalk
+++ b/gettext-tools/tests/lang-smalltalk
@@ -95,10 +95,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 \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: gst not found"; rm -fr $tmpfiles; 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])
-    rm -fr $tmpfiles; exit 77;;
+    echo "Skipping test: gst version too old"; rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
@@ -127,6 +127,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index 93d6fbe..377ea21 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -76,7 +76,9 @@ package require msgcat
 puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: tclsh not found or msgcat extension not present"
+       rm -fr $tmpfiles; exit 77
+     }
 
 tmpfiles="$tmpfiles prog.ok prog.oku prog.out"
 : ${DIFF=diff}
@@ -100,6 +102,11 @@ if test $LOCALE_FR_UTF8 != none; then
   ${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
+    echo "Skipping test: no french locale is installed"
+  else
+    echo "Skipping test: no french locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index 80ecf07..ec0d201 100755
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -19,13 +19,19 @@ fi
 
 # Some fold programs (like SunOS4 and FreeBSD) don't have an option to wrap at
 # spaces.
-echo abc | fold -b -s -w 20 >/dev/null 2>&1 || { rm -fr $tmpfiles; exit 77; }
+echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
+  echo "Skipping test: fold program not POSIX compliant"
+  rm -fr $tmpfiles; exit 77
+}
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
 # line was not terminated with a newline and the -s option was given.
 foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
-test "$foldoutputcount" = 3 || { rm -fr $tmpfiles; exit 77; }
+test "$foldoutputcount" = 3 || {
+  echo "Skipping test: fold program inserts extra newline"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles mfi-test1.po"
 cat <<\EOF > mfi-test1.po
diff --git a/gettext-tools/tests/msgfilter-2 b/gettext-tools/tests/msgfilter-2
index 8bb2ade..20887cd 100755
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -20,13 +20,19 @@ fi
 # Some sed programs (Solaris etc.) omit the last line if it ended without
 # a newline. We must skip this test when we encounter such a broken sed.
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
-test -n "$sedoutput" || { rm -fr $tmpfiles; exit 77; }
+test -n "$sedoutput" || {
+  echo "Skipping test: sed program is broken"
+  rm -fr $tmpfiles; exit 77
+}
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
 # doesn't end with a newline.
 sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
-test "$sedoutputcount" = 3 || { rm -fr $tmpfiles; exit 77; }
+test "$sedoutputcount" = 3 || {
+  echo "Skipping test: sed program inserts extra newline"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles mfi-test2.po"
 cat <<\EOF > mfi-test2.po
diff --git a/gettext-tools/tests/msgfilter-3 b/gettext-tools/tests/msgfilter-3
index e0c47fe..546f855 100755
--- a/gettext-tools/tests/msgfilter-3
+++ b/gettext-tools/tests/msgfilter-3
@@ -19,13 +19,19 @@ fi
 
 # Some fold programs (like SunOS4 and FreeBSD) don't have an option to wrap at
 # spaces.
-echo abc | fold -b -s -w 20 >/dev/null 2>&1 || { rm -fr $tmpfiles; exit 77; }
+echo abc | fold -b -s -w 20 >/dev/null 2>&1 || {
+  echo "Skipping test: fold program not POSIX compliant"
+  rm -fr $tmpfiles; exit 77
+}
 
 # Some fold programs (like HP-UX) insert a newline at the end, if the last
 # line was not terminated with a newline and the -s option was given.
 foldoutputcount=`echo $ac_n "abc$ac_c" | fold -b -s -w 20 | wc -c`
 foldoutputcount=`echo "$foldoutputcount" | sed -e 's/[ 	]//g'`
-test "$foldoutputcount" = 3 || { rm -fr $tmpfiles; exit 77; }
+test "$foldoutputcount" = 3 || {
+  echo "Skipping test: fold program inserts extra newline"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles mfi-test3.properties"
 cat <<\EOF > mfi-test3.properties
diff --git a/gettext-tools/tests/msgfilter-4 b/gettext-tools/tests/msgfilter-4
index e25d892..d8cab87 100755
--- a/gettext-tools/tests/msgfilter-4
+++ b/gettext-tools/tests/msgfilter-4
@@ -20,13 +20,19 @@ fi
 # Some sed programs (Solaris etc.) omit the last line if it ended without
 # a newline. We must skip this test when we encounter such a broken sed.
 sedoutput=`echo $ac_n "abc$ac_c" | sed -e s/x/x/`
-test -n "$sedoutput" || { rm -fr $tmpfiles; exit 77; }
+test -n "$sedoutput" || {
+  echo "Skipping test: sed program is broken"
+  rm -fr $tmpfiles; exit 77
+}
 
 # Some sed programs (IRIX, OSF/1 etc.) add a newline to the last line if it
 # doesn't end with a newline.
 sedoutputcount=`echo $ac_n "abc$ac_c" | sed -e s/x/x/ | wc -c`
 sedoutputcount=`echo "$sedoutputcount" | sed -e 's/[ 	]//g'`
-test "$sedoutputcount" = 3 || { rm -fr $tmpfiles; exit 77; }
+test "$sedoutputcount" = 3 || {
+  echo "Skipping test: sed program inserts extra newline"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles mfi-test4.po"
 cat <<\EOF > mfi-test4.po
diff --git a/gettext-tools/tests/msgunfmt-csharp-1 b/gettext-tools/tests/msgunfmt-csharp-1
index 01a587c..bfd7332 100755
--- a/gettext-tools/tests/msgunfmt-csharp-1
+++ b/gettext-tools/tests/msgunfmt-csharp-1
@@ -6,7 +6,18 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can compile and execute C# programs.
-test "${TESTCSHARP}" = yes || exit 77
+test "${CSHARP_CHOICE}" != no || {
+  echo "Skipping test: configured with --disable-csharp"
+  exit 77
+}
+test "${BUILDCSHARP}" = yes || {
+  echo "Skipping test: C# compiler not found"
+  exit 77
+}
+test "${TESTCSHARP}" = yes || {
+  echo "Skipping test: C# engine not found"
+  exit 77
+}
 
 tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
diff --git a/gettext-tools/tests/msgunfmt-java-1 b/gettext-tools/tests/msgunfmt-java-1
index c3ea1e9..f2158c7 100755
--- a/gettext-tools/tests/msgunfmt-java-1
+++ b/gettext-tools/tests/msgunfmt-java-1
@@ -9,7 +9,18 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can compile and execute Java programs.
-test "${TESTJAVA}" = yes || exit 77
+test "${JAVA_CHOICE}" != no || {
+  echo "Skipping test: configured with --disable-java"
+  exit 77
+}
+test "${BUILDJAVA}" = yes || {
+  echo "Skipping test: Java compiler or jar not found"
+  exit 77
+}
+test "${TESTJAVA}" = yes || {
+  echo "Skipping test: Java engine not found"
+  exit 77
+}
 
 tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
diff --git a/gettext-tools/tests/msgunfmt-tcl-1 b/gettext-tools/tests/msgunfmt-tcl-1
index 66d5760..679404d 100755
--- a/gettext-tools/tests/msgunfmt-tcl-1
+++ b/gettext-tools/tests/msgunfmt-tcl-1
@@ -13,7 +13,9 @@ fconfigure stdout -encoding utf-8
 puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
-  || { rm -fr $tmpfiles; exit 77; }
+  || { echo "Skipping test: tclsh not found or Tcl too old"
+       rm -fr $tmpfiles; exit 77
+     }
 
 tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
diff --git a/gettext-tools/tests/recode-sr-latin-1 b/gettext-tools/tests/recode-sr-latin-1
index 615f161..c71f879 100755
--- a/gettext-tools/tests/recode-sr-latin-1
+++ b/gettext-tools/tests/recode-sr-latin-1
@@ -16,6 +16,11 @@ if test $LOCALE_FR_UTF8 != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no french UTF-8 locale is installed"
+  else
+    echo "Skipping test: no french UTF-8 locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/recode-sr-latin-2 b/gettext-tools/tests/recode-sr-latin-2
index 62aa343..aea706d 100755
--- a/gettext-tools/tests/recode-sr-latin-2
+++ b/gettext-tools/tests/recode-sr-latin-2
@@ -18,6 +18,11 @@ if test $LOCALE_JA_EUCJP != none; then
   esac
 fi
 if test $LOCALE_JA_EUCJP = none; then
+  if test -f /usr/bin/localedef; then
+    echo "Skipping test: no japanese EUC-JP locale is installed"
+  else
+    echo "Skipping test: no japanese EUC-JP locale is supported"
+  fi
   rm -fr $tmpfiles; exit 77
 fi
 
diff --git a/gettext-tools/tests/testlocale.c b/gettext-tools/tests/testlocale.c
index 3383439..eac9578 100644
--- a/gettext-tools/tests/testlocale.c
+++ b/gettext-tools/tests/testlocale.c
@@ -1,5 +1,5 @@
 /* testlocale - test whether the locale given by the environment is installed.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,10 +34,8 @@ main (int argc, char *argv[])
 /* This test must match the one in intl/localename.c.  */
 #if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL
   if (setlocale (LC_ALL, "") == NULL)
-    {
-      fprintf (stderr, "Couldn't set locale.\n");
-      exit (77);
-    }
+    /* Couldn't set locale.  */
+    exit (77);
 #endif
   exit (0);
 }
diff --git a/gettext-tools/tests/xgettext-glade-1 b/gettext-tools/tests/xgettext-glade-1
index f87af40..d4323a0 100755
--- a/gettext-tools/tests/xgettext-glade-1
+++ b/gettext-tools/tests/xgettext-glade-1
@@ -14,7 +14,10 @@ EOF
 tmpfiles="$tmpfiles xg-gl-1.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-gl-1.pot empty.glade 2>/dev/null
-test $? = 0 || { rm -fr $tmpfiles; exit 77; }
+test $? = 0 || {
+  echo "Skipping test: xgettext was built without Glade support"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles widgets.glade"
 cat <<EOF > widgets.glade
diff --git a/gettext-tools/tests/xgettext-glade-2 b/gettext-tools/tests/xgettext-glade-2
index c40ead8..56b4048 100755
--- a/gettext-tools/tests/xgettext-glade-2
+++ b/gettext-tools/tests/xgettext-glade-2
@@ -15,7 +15,10 @@ EOF
 tmpfiles="$tmpfiles xg-gl-2.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-gl-2.pot empty.glade 2>/dev/null
-test $? = 0 || { rm -fr $tmpfiles; exit 77; }
+test $? = 0 || {
+  echo "Skipping test: xgettext was built without Glade support"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles simple.glade"
 cat <<\EOF > simple.glade
diff --git a/gettext-tools/tests/xgettext-glade-3 b/gettext-tools/tests/xgettext-glade-3
index 5539f35..0625e96 100755
--- a/gettext-tools/tests/xgettext-glade-3
+++ b/gettext-tools/tests/xgettext-glade-3
@@ -14,7 +14,10 @@ EOF
 tmpfiles="$tmpfiles xg-gl-3.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-gl-3.pot empty.glade 2>/dev/null
-test $? = 0 || { rm -fr $tmpfiles; exit 77; }
+test $? = 0 || {
+  echo "Skipping test: xgettext was built without Glade support"
+  rm -fr $tmpfiles; exit 77
+}
 
 tmpfiles="$tmpfiles asciitable.glade2"
 cat <<EOF > asciitable.glade2