X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gettext-tools%2Ftests%2Flang-pascal;h=76a12b671410e7df2912773b66860fc1937186c1;hb=refs%2Fchanges%2F82%2F71082%2F1;hp=2b879fe3221ac2527a243a3d0c4aed8f325caf8a;hpb=5d61132f836323aaf2879e04abc9d4056db248a2;p=platform%2Fupstream%2Fgettext.git

diff --git a/gettext-tools/tests/lang-pascal b/gettext-tools/tests/lang-pascal
index 2b879fe..76a12b6 100755
--- a/gettext-tools/tests/lang-pascal
+++ b/gettext-tools/tests/lang-pascal
@@ -1,4 +1,5 @@
 #! /bin/sh
+. "${srcdir=.}/init.sh"; path_prepend_ . ../src
 
 # Test of gettext facilities in the Object Pascal language.
 # Assumes the following packages are installed: fpk.
@@ -8,10 +9,6 @@
 # This here is a quick workaround:
 UTF8_LOCALE_UNSUPPORTED=yes
 
-tmpfiles=""
-trap 'rm -fr $tmpfiles' 1 2 3 15
-
-tmpfiles="$tmpfiles pascalprog.pp"
 cat <<\EOF > pascalprog.pp
 program pascalprog;
 {$mode delphi}
@@ -23,29 +20,24 @@ resourcestring
   currencies = '%s is replaced by %s.';
 
 begin
-  translateresourcestrings('l-pascal/%s/LC_MESSAGES/pascalprog.mo');
+  translateresourcestrings('%s/LC_MESSAGES/pascalprog.mo');
   writeln(question);
   writeln(format(currencies, ['FF', 'EUR']));
 end.
 EOF
 
-tmpfiles="$tmpfiles pascalprog.o pascalprog.rst pascalprog"
 (ppc386 pascalprog.pp) >/dev/null 2>&1 ||
 (ppcx64 pascalprog.pp) >/dev/null 2>&1 ||
 {
   echo "Skipping test: Pascal compiler ppc386 or ppcx64 not found"
-  rm -fr $tmpfiles; exit 77
+  exit 77
 }
 
-tmpfiles="$tmpfiles l-pascal-pascalprog.tmp l-pascal-pascalprog.pot"
 : ${XGETTEXT=xgettext}
-${XGETTEXT} -o l-pascal-pascalprog.tmp --omit-header --add-location pascalprog.rst
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < l-pascal-pascalprog.tmp > l-pascal-pascalprog.pot
-test $? = 0 || { rm -fr $tmpfiles; 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
 
-tmpfiles="$tmpfiles l-pascal-pascalprog.ok"
-cat <<EOF > l-pascal-pascalprog.ok
+cat <<EOF > pascalprog.ok
 #: pascalprog.question
 msgid "'Your command, please?', asked the waiter."
 msgstr ""
@@ -57,10 +49,9 @@ msgstr ""
 EOF
 
 : ${DIFF=diff}
-${DIFF} l-pascal-pascalprog.ok l-pascal-pascalprog.pot || exit 1
+${DIFF} pascalprog.ok pascalprog.pot || exit 1
 
-tmpfiles="$tmpfiles l-pascal-fr.po"
-cat <<\EOF > l-pascal-fr.po
+cat <<\EOF > fr.po
 msgid ""
 msgstr "Content-Type: text/plain; charset=ISO-8859-1\n"
 
@@ -75,31 +66,25 @@ msgid "%s is replaced by %s."
 msgstr "%1:s remplace %0:s."
 EOF
 
-tmpfiles="$tmpfiles l-pascal-fr.po.tmp l-pascal-fr.po.new"
 : ${MSGMERGE=msgmerge}
-${MSGMERGE} -q -o l-pascal-fr.po.tmp l-pascal-fr.po l-pascal-pascalprog.pot
-test $? = 0 || { rm -fr $tmpfiles; exit 1; }
-LC_ALL=C tr -d '\r' < l-pascal-fr.po.tmp > l-pascal-fr.po.new
-test $? = 0 || { rm -fr $tmpfiles; 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} l-pascal-fr.po l-pascal-fr.po.new || exit 1
+${DIFF} fr.po fr.po.new || exit 1
 
-tmpfiles="$tmpfiles l-pascal"
-test -d l-pascal || mkdir l-pascal
-test -d l-pascal/fr || mkdir l-pascal/fr
-test -d l-pascal/fr/LC_MESSAGES || mkdir l-pascal/fr/LC_MESSAGES
+test -d fr || mkdir fr
+test -d fr/LC_MESSAGES || mkdir fr/LC_MESSAGES
 
 : ${MSGFMT=msgfmt}
-${MSGFMT} -o l-pascal/fr/LC_MESSAGES/pascalprog.mo l-pascal-fr.po
+${MSGFMT} -o fr/LC_MESSAGES/pascalprog.mo fr.po
 
-tmpfiles="$tmpfiles l-pascal-pascalprog.ok l-pascal-pascalprog.oku l-pascal-pascalprog.out"
 : ${DIFF=diff}
-cat <<\EOF > l-pascal-pascalprog.ok
+cat <<\EOF > pascalprog.ok
 «Votre commande, s'il vous plait», dit le garçon.
 EUR remplace FF.
 EOF
-cat <<\EOF > l-pascal-pascalprog.oku
+cat <<\EOF > pascalprog.oku
 «Votre commande, s'il vous plait», dit le garçon.
 EUR remplace FF.
 EOF
@@ -107,15 +92,17 @@ EOF
 : ${LOCALE_FR=fr_FR}
 : ${LOCALE_FR_UTF8=fr_FR.UTF-8}
 if test $LOCALE_FR != none; then
-  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > l-pascal-pascalprog.out || exit 1
+  prepare_locale_ fr $LOCALE_FR
+  LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR ./pascalprog > pascalprog.out || exit 1
   : ${DIFF=diff}
-  ${DIFF} l-pascal-pascalprog.ok l-pascal-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
-    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > l-pascal-pascalprog.out || exit 1
+    prepare_locale_ fr $LOCALE_FR_UTF8
+    LANGUAGE= LC_ALL= LC_MESSAGES= LC_CTYPE= LANG=$LOCALE_FR_UTF8 ./pascalprog > pascalprog.out || exit 1
     : ${DIFF=diff}
-    ${DIFF} l-pascal-pascalprog.oku l-pascal-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
@@ -123,7 +110,7 @@ if test -z "$UTF8_LOCALE_UNSUPPORTED"; then
     else
       echo "Skipping test: no french locale is supported"
     fi
-    rm -fr $tmpfiles; exit 77
+    exit 77
   fi
 else
   if test $LOCALE_FR = none; then
@@ -132,10 +119,8 @@ else
     else
       echo "Skipping test: no traditional french locale is supported"
     fi
-    rm -fr $tmpfiles; exit 77
+    exit 77
   fi
 fi
 
-rm -fr $tmpfiles
-
 exit 0