Imported Upstream version 0.19.7

[platform/upstream/gettext.git] / gettext-tools / tests / lang-java

diff --git a/gettext-tools/tests/lang-java b/gettext-tools/tests/lang-java
index ae9e7b0..e09ec86 100755 (executable)
--- a/gettext-tools/tests/lang-java
+++ b/gettext-tools/tests/lang-java
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Java language.
 # Assumes an fr_FR locale is installed.
@@ -7,9 +8,6 @@
 # Note: This test fails when using gcj from GCC 3.1 and GCC 3.2, due to a bug
 # (libgcj/6576). It is fixed in GCC 3.3.
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
 # Test whether we can build and test Java programs.
 test "${JAVA_CHOICE}" != no || {
   echo "Skipping test: configured with --disable-java"
@@ -24,7 +22,6 @@ test "${TESTJAVA}" = yes || {
   exit 77
 }
 
-tmpfiles="$tmpfiles Program.java"
 cat <<\EOF > Program.java
 import java.util.*;
 import java.io.*;
@@ -62,22 +59,15 @@ cat <<\EOF >> Program.java
 }
 EOF
 
-tmpfiles="$tmpfiles Program.class l-java l-java-prog.err"
-test -d l-java || mkdir l-java
-
-: ${JAVACOMP="/bin/sh ../javacomp.sh"}
-CLASSPATH=../../gettext-runtime/intl-java/libintl.jar ${JAVACOMP} -d l-java Program.java 2>l-java-prog.err \
-  || { cat l-java-prog.err 1>&2; exit 1; }
+: ${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; }
 
-tmpfiles="$tmpfiles l-java-prog.tmp l-java-prog.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o l-java-prog.tmp --omit-header --no-location Program.java
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < l-java-prog.tmp > l-java-prog.pot
-test $? = 0 || { rm -fr $tmpfiles; 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
 
-tmpfiles="$tmpfiles l-java-prog.ok"
-cat <<EOF > l-java-prog.ok
+cat <<EOF > prog.ok
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
 
@@ -105,10 +95,9 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} l-java-prog.ok l-java-prog.pot || exit 1
+${DIFF} prog.ok prog.pot || exit 1
 
-tmpfiles="$tmpfiles l-java-fr.po"
-cat <<\EOF > l-java-fr.po
+cat <<\EOF > fr.po
 msgid ""
 msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -144,25 +133,21 @@ msgid "{0} is replaced by {1}."
 msgstr "Le nouveau {1} remplace le vieux {0}."
 EOF
 
-tmpfiles="$tmpfiles l-java-fr.po.tmp l-java-fr.po.new"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o l-java-fr.po.tmp l-java-fr.po l-java-prog.pot
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < l-java-fr.po.tmp > l-java-fr.po.new
-test $? = 0 || { rm -fr $tmpfiles; 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} l-java-fr.po l-java-fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || exit 1
 
-tmpfiles="$tmpfiles prog_fr.class"
 : ${MSGFMT=msgfmt}
-${MSGFMT} -j -d l-java -r prog -l fr l-java-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}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LC_ALL=$LOCALE_FR ./testlocale
+  LC_ALL=$LOCALE_FR ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR=none;;
@@ -170,7 +155,7 @@ if test $LOCALE_FR != none; then
   esac
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LC_ALL=$LOCALE_FR_UTF8 ./testlocale
+  LC_ALL=$LOCALE_FR_UTF8 ../testlocale
   case $? in
     0) ;;
     77) LOCALE_FR_UTF8=none;;
@@ -183,19 +168,18 @@ if test $LOCALE_FR = none && test $LOCALE_FR_UTF8 = none; then
   else
     echo "Skipping test: no french locale is supported"
   fi
-  rm -fr $tmpfiles; exit 77
+  exit 77
 fi
 
-tmpfiles="$tmpfiles l-java-prog.ok l-java-prog.oku l-java-prog.out"
 : ${DIFF=diff}
-cat <<\EOF > l-java-prog.ok
+cat <<\EOF > prog.ok
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
 2 morceaux de gateau succulent
 Le nouveau EUR remplace le vieux FF.
 EOF
-cat <<\EOF > l-java-prog.oku
+cat <<\EOF > prog.oku
 «Votre commande, s'il vous plait», dit le garçon.
 2 morceaux de gateau
 EUR remplace FF.
@@ -205,16 +189,16 @@ EOF
 
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
-: ${JAVAEXEC="/bin/sh ../javaexec.sh"}
+: ${JAVAEXEC="/bin/sh ../../javaexec.sh"}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 ISO-8859-1 > l-java-prog.out || exit 1
-  ${DIFF} l-java-prog.ok l-java-prog.out || exit 1
+  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
 fi
 if test $LOCALE_FR_UTF8 != none; then
-  LANGUAGE= LC_ALL=$LOCALE_FR_UTF8 CLASSPATH=l-java:../../gettext-runtime/intl-java/libintl.jar ${JAVAEXEC} Program 2 UTF-8 > l-java-prog.out || exit 1
-  ${DIFF} l-java-prog.oku l-java-prog.out || exit 1
+  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
 fi
 
-rm -fr $tmpfiles
-
 exit 0