From: Bruno Haible <bruno@clisp.org>
Date: Thu, 20 Feb 2003 18:04:02 +0000 (+0000)
Subject: Remove SKIP: messages, now that automake emits them from the Makefile.
X-Git-Tag: v0.12~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b90432f0abb198542193664a24ec97c8bcaa2b01;p=thirdparty%2Fgettext.git

Remove SKIP: messages, now that automake emits them from the Makefile.
---

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 8ee04689a..fc1995fc5 100644
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,24 @@
+2003-02-20  Bruno Haible  <bruno@clisp.org>
+
+	* msgfilter-1: Remove SKIP: messages, now emitted by the Makefile.
+	* msgfilter-2: Likewise.
+	* msgunfmt-2: Likewise.
+	* msgunfmt-3: Likewise.
+	* xgettext-19: Likewise.
+	* xgettext-20: Likewise.
+	* lang-c: Likewise.
+	* lang-c++: Likewise.
+	* lang-clisp: Likewise.
+	* lang-gawk: Likewise.
+	* lang-java: Likewise.
+	* lang-librep: Likewise.
+	* lang-objc: Likewise.
+	* lang-pascal: Likewise.
+	* lang-php: Likewise.
+	* lang-python: Likewise.
+	* lang-smalltalk: Likewise.
+	* lang-tcl: Likewise.
+
 2003-02-20  Bruno Haible  <bruno@clisp.org>
 
 	* lang-gawk: Skip the test if gawk was built with --disable-nls.
diff --git a/gettext-tools/tests/lang-c b/gettext-tools/tests/lang-c
index f18a737d6..9f783f950 100755
--- a/gettext-tools/tests/lang-c
+++ b/gettext-tools/tests/lang-c
@@ -124,7 +124,7 @@ EOF
 LANGUAGE= ./prog fr_FR 2 > prog.out
 case $? in
   0) ;;
-  77) echo "SKIP: lang-c"; rm -fr $tmpfiles; exit 77;;
+  77) rm -fr $tmpfiles; exit 77;;
   *) exit 1;;
 esac
 ${DIFF} prog.ok prog.out || exit 1
diff --git a/gettext-tools/tests/lang-c++ b/gettext-tools/tests/lang-c++
index 08415eaf6..31dcd9dd9 100755
--- a/gettext-tools/tests/lang-c++
+++ b/gettext-tools/tests/lang-c++
@@ -9,7 +9,7 @@ trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether a C++ compiler is found.
 if test "${CXX}" = ":"; then
-  echo "SKIP: lang-c++"; exit 77
+  exit 77
 fi
 
 tmpfiles="$tmpfiles prog.cc"
@@ -138,7 +138,7 @@ EOF
 LANGUAGE= ./prog fr_FR 2 > prog.out
 case $? in
   0) ;;
-  77) echo "SKIP: lang-c++"; rm -fr $tmpfiles; exit 77;;
+  77) rm -fr $tmpfiles; exit 77;;
   *) exit 1;;
 esac
 ${DIFF} prog.ok prog.out || exit 1
diff --git a/gettext-tools/tests/lang-clisp b/gettext-tools/tests/lang-clisp
index d0694a995..5218c7fd8 100755
--- a/gettext-tools/tests/lang-clisp
+++ b/gettext-tools/tests/lang-clisp
@@ -85,15 +85,15 @@ ${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 "SKIP: lang-clisp"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 version=`clisp --version | sed -e 's/^[^0-9]*//'`
 case $version in
   19* | 20*) # older than 2.25
-    echo "SKIP: lang-clisp"; rm -fr $tmpfiles; exit 77;;
+    rm -fr $tmpfiles; exit 77;;
 esac
 version=`echo $version | sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'`
 clisp -norc -x "(sys::exit (not (>= $version 2.28)))" >/dev/null \
-  || { echo "SKIP: lang-clisp"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles prog.ok prog.out"
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/lang-gawk b/gettext-tools/tests/lang-gawk
index 2914f40bb..feb106625 100755
--- a/gettext-tools/tests/lang-gawk
+++ b/gettext-tools/tests/lang-gawk
@@ -83,15 +83,15 @@ ${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 \
-  || { echo "SKIP: lang-gawk"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 case `gawk --version 2>&1 | sed -e 's/^[^0-9]*//'` in
   0.* | 1.* | 2.* | 3.0* | 3.1.0*)
-    echo "SKIP: lang-gawk"; rm -fr $tmpfiles; exit 77;;
+    rm -fr $tmpfiles; exit 77;;
 esac
 
 # Test that gawk wasn't built with --disable-nls.
 LANGUAGE= LC_ALL=fr_FR gawk --version | grep logiciel > /dev/null
-test $? = 0 || { echo "SKIP: lang-gawk"; rm -fr $tmpfiles; exit 77; }
+test $? = 0 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles prog.ok prog.out"
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index 0eae76165..7ab038d73 100755
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -8,7 +8,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can build and test Java programs.
-test "${TESTJAVA}" = yes || { echo "SKIP: lang-java"; exit 77; }
+test "${TESTJAVA}" = yes || exit 77
 
 tmpfiles="$tmpfiles Program.java"
 cat <<\EOF > Program.java
diff --git a/gettext-tools/tests/lang-librep b/gettext-tools/tests/lang-librep
index 02b36fddc..0fa2f3cb2 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 \
-  || { echo "SKIP: lang-librep"; rm -fr $tmpfiles; exit 77; }
+  || { 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] )
-    echo "SKIP: lang-librep"; rm -fr $tmpfiles; exit 77;;
+    rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.out"
diff --git a/gettext-tools/tests/lang-objc b/gettext-tools/tests/lang-objc
index 160dc59a7..a99898a5d 100755
--- a/gettext-tools/tests/lang-objc
+++ b/gettext-tools/tests/lang-objc
@@ -19,7 +19,7 @@ int main ()
 }
 EOF
 ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -o hello hello.m 2>/dev/null \
-  || { echo "SKIP: lang-objc"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles prog.m"
 cat <<\EOF > prog.m
@@ -138,7 +138,7 @@ EOF
 LANGUAGE= ./prog fr_FR 2 > prog.out
 case $? in
   0) ;;
-  77) echo "SKIP: lang-objc"; rm -fr $tmpfiles; exit 77;;
+  77) rm -fr $tmpfiles; exit 77;;
   *) exit 1;;
 esac
 ${DIFF} prog.ok prog.out || exit 1
diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index bae237a12..61ecbe782 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -25,7 +25,7 @@ end.
 EOF
 
 tmpfiles="$tmpfiles prog.o prog.rst prog"
-(ppc386 prog.pp) >/dev/null 2>&1 || { echo "SKIP: lang-pascal"; rm -fr $tmpfiles; exit 77; }
+(ppc386 prog.pp) >/dev/null 2>&1 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles prog.pot"
 : ${XGETTEXT=xgettext}
diff --git a/gettext-tools/tests/lang-php b/gettext-tools/tests/lang-php
index 3fd8fbe48..76f479322 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 gawk version 4.0 or newer.
 case `(php -v) 2>/dev/null` in
   [4-9].*) ;;
-  *) echo "SKIP: lang-php"; rm -fr $tmpfiles; exit 77;;
+  *) rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.out"
diff --git a/gettext-tools/tests/lang-python b/gettext-tools/tests/lang-python
index f536e93a3..460c1ac76 100755
--- a/gettext-tools/tests/lang-python
+++ b/gettext-tools/tests/lang-python
@@ -66,10 +66,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 "SKIP: lang-python"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 case `python -c 'import sys; print sys.hexversion >= 0x20000F0'` in
   1) ;;
-  *) echo "SKIP: lang-python"; rm -fr $tmpfiles; exit 77;;
+  *) rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.out"
diff --git a/gettext-tools/tests/lang-smalltalk b/gettext-tools/tests/lang-smalltalk
index 1b39df417..2d3485a29 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 \
-  || { echo "SKIP: lang-smalltalk"; rm -fr $tmpfiles; exit 77; }
+  || { 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])
-    echo "SKIP: lang-smalltalk"; rm -fr $tmpfiles; exit 77;;
+    rm -fr $tmpfiles; exit 77;;
 esac
 
 tmpfiles="$tmpfiles prog.ok prog.out"
diff --git a/gettext-tools/tests/lang-tcl b/gettext-tools/tests/lang-tcl
index d0171ce5c..90d87d133 100755
--- a/gettext-tools/tests/lang-tcl
+++ b/gettext-tools/tests/lang-tcl
@@ -72,7 +72,7 @@ package require msgcat
 puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
-  || { echo "SKIP: lang-tcl"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles prog.ok prog.out"
 : ${DIFF=diff}
diff --git a/gettext-tools/tests/msgfilter-1 b/gettext-tools/tests/msgfilter-1
index 5043d6ba2..80ecf0760 100755
--- a/gettext-tools/tests/msgfilter-1
+++ b/gettext-tools/tests/msgfilter-1
@@ -19,13 +19,13 @@ 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 || { echo "SKIP: msgfilter-1"; rm -fr $tmpfiles; exit 77; }
+echo abc | fold -b -s -w 20 >/dev/null 2>&1 || { 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 || { echo "SKIP: msgfilter-1"; rm -fr $tmpfiles; exit 77; }
+test "$foldoutputcount" = 3 || { 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 577c76722..8bb2ade29 100755
--- a/gettext-tools/tests/msgfilter-2
+++ b/gettext-tools/tests/msgfilter-2
@@ -20,13 +20,13 @@ 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" || { echo "SKIP: msgfilter-2"; rm -fr $tmpfiles; exit 77; }
+test -n "$sedoutput" || { 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 || { echo "SKIP: msgfilter-2"; rm -fr $tmpfiles; exit 77; }
+test "$sedoutputcount" = 3 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles mfi-test2.po"
 cat <<\EOF > mfi-test2.po
diff --git a/gettext-tools/tests/msgunfmt-2 b/gettext-tools/tests/msgunfmt-2
index d11cb85a7..cde03f70a 100755
--- a/gettext-tools/tests/msgunfmt-2
+++ b/gettext-tools/tests/msgunfmt-2
@@ -6,7 +6,7 @@ tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
 # Test whether we can compile and execute Java programs.
-test "${TESTJAVA}" = yes || { echo "SKIP: msgunfmt-2"; exit 77; }
+test "${TESTJAVA}" = yes || exit 77
 
 tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
diff --git a/gettext-tools/tests/msgunfmt-3 b/gettext-tools/tests/msgunfmt-3
index 36e667596..66d57600e 100755
--- a/gettext-tools/tests/msgunfmt-3
+++ b/gettext-tools/tests/msgunfmt-3
@@ -13,7 +13,7 @@ fconfigure stdout -encoding utf-8
 puts $tcl_version
 EOF
 (tclsh version.tcl) >/dev/null 2>/dev/null \
-  || { echo "SKIP: msgunfmt-3"; rm -fr $tmpfiles; exit 77; }
+  || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles fr.po"
 cat <<\EOF > fr.po
diff --git a/gettext-tools/tests/xgettext-19 b/gettext-tools/tests/xgettext-19
index eb6ed8902..2616aa73e 100755
--- a/gettext-tools/tests/xgettext-19
+++ b/gettext-tools/tests/xgettext-19
@@ -14,7 +14,7 @@ EOF
 tmpfiles="$tmpfiles xg-test19.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-test19.pot empty.glade 2>/dev/null
-test $? = 0 || { echo "SKIP: xgettext-19"; rm -fr $tmpfiles; exit 77; }
+test $? = 0 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles widgets.glade"
 cat <<EOF > widgets.glade
diff --git a/gettext-tools/tests/xgettext-20 b/gettext-tools/tests/xgettext-20
index a92ff8639..a55626d35 100755
--- a/gettext-tools/tests/xgettext-20
+++ b/gettext-tools/tests/xgettext-20
@@ -15,7 +15,7 @@ EOF
 tmpfiles="$tmpfiles xg-test20.pot"
 : ${XGETTEXT=xgettext}
 ${XGETTEXT} -o xg-test20.pot empty.glade 2>/dev/null
-test $? = 0 || { echo "SKIP: xgettext-20"; rm -fr $tmpfiles; exit 77; }
+test $? = 0 || { rm -fr $tmpfiles; exit 77; }
 
 tmpfiles="$tmpfiles simple.glade"
 cat <<\EOF > simple.glade