Tweaks.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index 4251cec0e20b7490c05f41b5f1d43ad135d05a09..6b4d686f59fddd7ea99640a778bc0e41980968b6 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -65,8 +65,8 @@ TESTS = gettext-1 gettext-2 \
        plural-1 plural-2 \
        lang-c lang-c++ lang-objc lang-python-1 lang-python-2 lang-clisp \
        lang-elisp lang-librep lang-smalltalk lang-java lang-gawk lang-pascal \
-       lang-ycp lang-tcl lang-php lang-po \
-       lang-rst lang-perl
+       lang-ycp lang-tcl lang-perl lang-php lang-po \
+       lang-rst
 
 EXTRA_DIST += $(TESTS) \
        test.mo xg-test1.ok.po mex-test2.ok msguniq-a.in msguniq-a.inp \

diff --git a/gettext-tools/tests/format-perl-1 b/gettext-tools/tests/format-perl-1
index 1bbb5b830c9ecf5ab7e6b72b07a44239c72dfba3..801a5b5cbf78b44d5abb3babd1c77bb31ff9dd46 100755 (executable)
--- a/gettext-tools/tests/format-perl-1
+++ b/gettext-tools/tests/format-perl-1
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles f-a-1.data"
-cat <<\EOF > f-a-1.data
+tmpfiles="$tmpfiles f-pl-1.data"
+cat <<\EOF > f-pl-1.data
 # Valid: no argument
 'abc%%'
 # Valid: one character argument
@@ -132,21 +132,21 @@ n=0
 while read comment; do
   read string
   n=`expr $n + 1`
-  tmpfiles="$tmpfiles f-a-1-$n.in f-a-1-$n.po"
-  cat <<EOF > f-a-1-$n.in
+  tmpfiles="$tmpfiles f-pl-1-$n.in f-pl-1-$n.po"
+  cat <<EOF > f-pl-1-$n.in
 gettext(${string});
 EOF
-  ${XGETTEXT} -L perl -o f-a-1-$n.po f-a-1-$n.in || exit 1
-  test -f f-a-1-$n.po || exit 1
+  ${XGETTEXT} -L perl -o f-pl-1-$n.po f-pl-1-$n.in || exit 1
+  test -f f-pl-1-$n.po || exit 1
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if grep perl-format f-a-1-$n.po > /dev/null; then
+    if grep perl-format f-pl-1-$n.po > /dev/null; then
       :
     else
       fail=yes
     fi
   else
-    if grep perl-format f-a-1-$n.po > /dev/null; then
+    if grep perl-format f-pl-1-$n.po > /dev/null; then
       fail=yes
     else
       :
@@ -154,12 +154,12 @@ EOF
   fi
   if test -n "$fail"; then
     echo "Format string recognition error:" 1>&2
-    cat f-a-1-$n.in 1>&2
+    cat f-pl-1-$n.in 1>&2
     echo "Got:" 1>&2
-    cat f-a-1-$n.po 1>&2
+    cat f-pl-1-$n.po 1>&2
     exit 1
   fi
-done < f-a-1.data
+done < f-pl-1.data
 
 rm -fr $tmpfiles
 

diff --git a/gettext-tools/tests/format-perl-2 b/gettext-tools/tests/format-perl-2
index a8b66441e99ac67c1f527f7bbb7754ddf216c8d1..929628aff176450d511c08f94ce75eb6a6957998 100755 (executable)
--- a/gettext-tools/tests/format-perl-2
+++ b/gettext-tools/tests/format-perl-2
@@ -5,8 +5,8 @@
 tmpfiles=""
 trap 'rm -fr $tmpfiles' 1 2 3 15
 
-tmpfiles="$tmpfiles f-a-2.data"
-cat <<\EOF > f-a-2.data
+tmpfiles="$tmpfiles f-pl-2.data"
+cat <<\EOF > f-pl-2.data
 # Valid: %% doesn't count
 msgid  "abc%%def"
 msgstr "xyz"
@@ -126,21 +126,21 @@ while read comment; do
   read msgid_line
   read msgstr_line
   n=`expr $n + 1`
-  tmpfiles="$tmpfiles f-a-2-$n.po f-a-2-$n.mo"
-  cat <<EOF > f-a-2-$n.po
+  tmpfiles="$tmpfiles f-pl-2-$n.po f-pl-2-$n.mo"
+  cat <<EOF > f-pl-2-$n.po
 #, perl-format
 ${msgid_line}
 ${msgstr_line}
 EOF
   fail=
   if echo "$comment" | grep 'Valid:' > /dev/null; then
-    if ${MSGFMT} --check-format -o f-a-2-$n.mo f-a-2-$n.po; then
+    if ${MSGFMT} --check-format -o f-pl-2-$n.mo f-pl-2-$n.po; then
       :
     else
       fail=yes
     fi
   else
-    ${MSGFMT} --check-format -o f-a-2-$n.mo f-a-2-$n.po 2> /dev/null
+    ${MSGFMT} --check-format -o f-pl-2-$n.mo f-pl-2-$n.po 2> /dev/null
     if test $? = 1; then
       :
     else
@@ -149,10 +149,10 @@ EOF
   fi
   if test -n "$fail"; then
     echo "Format string checking error:" 1>&2
-    cat f-a-2-$n.po 1>&2
+    cat f-pl-2-$n.po 1>&2
     exit 1
   fi
-done < f-a-2.data
+done < f-pl-2.data
 
 rm -fr $tmpfiles