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

This commit is contained in:
Bruno Haible 2003-02-20 18:04:02 +00:00
parent b84cdf7e74
commit b90432f0ab
19 changed files with 50 additions and 29 deletions

View File

@ -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.

View File

@ -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

View File

@ -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

View File

@ -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}

View File

@ -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}

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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}

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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}

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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