[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, pot-primary, updated. v1.11
|
From: |
Stefano Lattarini |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, pot-primary, updated. v1.11-340-g41f0c9f |
|
Date: |
Wed, 08 Sep 2010 10:13:03 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=41f0c9f82cf95fc373a42b9a5eee3c905c9c8ff1
The branch, pot-primary has been updated
via 41f0c9f82cf95fc373a42b9a5eee3c905c9c8ff1 (commit)
via 884e0a75879e73c436c9c116dfde6732ff7e9dff (commit)
via 3e1c807be8de4b70fc41e1b10b2df35479c59777 (commit)
via dcb3313b93f4e3cc93a3510cf96639f2dd587687 (commit)
via 0555e641094da91f8e5a3e6167d2d4e8763a2246 (commit)
from 45c45ae4ee5a4a60768a755bc66e707463de8d42 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 41f0c9f82cf95fc373a42b9a5eee3c905c9c8ff1
Author: Stefano Lattarini <address@hidden>
Date: Mon Sep 6 17:14:02 2010 +0200
Internationalization tests: prefer `test ! -r' over `test ! -f'
We now use `test ! -r' rather than `test ! -f' to check that
a file does not exists (`test ! -e' would be even better, but
unfortunately it is unportable to e.g. Solaris /bin/sh).
* tests/pot-copyright.test: Prefer `test ! -r' over `test ! -f'.
* tests/pot-empty.test: Likewise.
* tests/pot-format-csharp1.test: Likewise.
* tests/pot-format-java1.test: Likewise.
* tests/pot-format-java2.test: Likewise.
* tests/pot-format-qt1.test: Likewise.
* tests/pot-format-tcl1.test: Likewise.
* tests/pot-linguas.test: Likewise.
* tests/pot-msgidbugs.test: Likewise.
* tests/pot-no-linguas.test: Likewise.
* tests/pot-noinst.test: Likewise.
* tests/pot-override1.test: Likewise.
* tests/pot-samedir.test: Likewise.
* tests/pot-topsrcdir.test: Likewise.
* tests/pot-xgettext1.test: Likewise.
* tests/pot-xgettext2.test: Likewise.
* tests/pot-xgettext3.test: Likewise.
* tests/pot-xgettext4.test: Likewise.
commit 884e0a75879e73c436c9c116dfde6732ff7e9dff
Author: Stefano Lattarini <address@hidden>
Date: Mon Sep 6 16:52:25 2010 +0200
Internationalization tests: prefer `make distdir' over `make dist'.
Instead of running `make dist', then uncompressing the created
tarball, and then grepping the uncompressed tar archive, we can
simply run `make distdir' and analyze the contents of the created
distibution directory. This is both faster and cleaner.
* tests/pot-msgidbugs.test: Test updated to use `make distdir'
instead of `make dist' where possible.
* tests/pot-no-linguas.test: Likewise.
* tests/pot-override1.test: Likewise.
* tests/pot-xgettext1.test: Likewise.
* tests/pot-xgettext2.test: Likewise.
* tests/pot-xgettext3.test: Likewise.
* tests/pot-xgettext4.test: Likewise.
* tests/pot-download1.test: Likewise, and check the created
distdir instead of the distribution tarball (which is not even
created anymore).
($distdir): New variable.
* tests/pot-format-csharp1.test: Likewise.
* tests/pot-format-java1.test: Likewise.
* tests/pot-format-java2.test: Likewise.
* tests/pot-format-qt1.test: Likewise.
* tests/pot-format-tcl1.test: Likewise.
* tests/pot-linguas.test: Likewise.
* tests/pot-noinst.test: Likewise.
* tests/pot-samedir.test: Likewise.
* tests/pot-topsrcdir.test: Likewise.
commit 3e1c807be8de4b70fc41e1b10b2df35479c59777
Author: Stefano Lattarini <address@hidden>
Date: Mon Sep 6 14:32:30 2010 +0200
Fixlets for internationalization tests.
* tests/pot-copyright.test: Add trailing `:' command.
* tests/pot-empty.test: Likewise.
* tests/pot-download1.test: Likewise. Use `Exit', not `exit'.
($required): Remove gzip, as we must take it for granted anyway.
* tests/pot-format-qt1.test: Use `Exit', not `exit'. Use `$MAKE',
not bare `make'. Add trailing `:' command. Avoid useless use of
cat. Do not redirect output of grep, cmp, etc. to /dev/null.
Other minor cosmetic changes.
* tests/pot-format-java1.test: Likewise, and ...
($required): Remove gzip, as we must take it for granted anyway.
* tests/pot-format-java2.test: Likewise.
* tests/pot-format-tcl1.test: Likewise.
* tests/pot-linguas.test: Likewise.
* tests/pot-noinst.test: Likewise.
* tests/pot-samedir.test: Likewise.
* tests/pot-topsrcdir.test: Likewise.
* tests/pot-format-csharp1.test: Likewise, and quote all literal
dots in grep regexps.
* tests/pot-enable1.test: Use `$MAKE', not bare `make'. Do not
redirect grep output to /dev/null. Add trailing `:' command.
(Makefile.am): Explicitly declare phony target as such.
* tests/pot-enable2.test: Likewise.
* tests/pot-msgidbugs.test: Use `$MAKE', not bare `make'. Avoid
useless use of cat. Add trailing `:' command.
* tests/pot-xgettext1.test: Likewise.
* tests/pot-xgettext2.test: Likewise.
* tests/pot-xgettext3.test: Likewise.
* tests/pot-xgettext4.test: Likewise.
* tests/pot-no-linguas.test: Likewise, and do not redirect grep
output to /dev/null.
* tests/pot-override1.test: Likewise.
* tests/pot-macro-warn.test: Avoid useless use of `AUTOMAKE_run'.
Add trailing `:' command.
* tests/pot-warn1.test: Likewise.
* tests/pot-warn2.test: Likewise.
commit dcb3313b93f4e3cc93a3510cf96639f2dd587687
Author: Stefano Lattarini <address@hidden>
Date: Mon Sep 6 14:34:09 2010 +0200
List internationalization tests in tests/Makefile.am.
* tests/Makefile.am (TESTS, XFAIL_TESTS): Add internationalization
tests `pot-*.test' introduced in previous commits.
commit 0555e641094da91f8e5a3e6167d2d4e8763a2246
Author: Stefano Lattarini <address@hidden>
Date: Mon Sep 6 14:40:48 2010 +0200
Make internationalization tests executable.
* tests/pot-macro-warn.test: Made executable.
* tests/pot-enable1.test: Likewise.
* tests/pot-enable2.test: Likewise.
* tests/pot-warn1.test: Likewise.
* tests/pot-warn2.test: Likewise.
* tests/pot-empty.test: Likewise.
* tests/pot-no-linguas.test: Likewise.
* tests/pot-linguas.test: Likewise.
* tests/pot-noinst.test: Likewise.
* tests/pot-topsrcdir.test: Likewise.
* tests/pot-samedir.test: Likewise.
* tests/pot-override1.test: Likewise.
* tests/pot-copyright.test: Likewise.
* tests/pot-msgidbugs.test: Likewise.
* tests/pot-xgettext1.test: Likewise.
* tests/pot-xgettext2.test: Likewise.
* tests/pot-xgettext3.test: Likewise.
* tests/pot-xgettext4.test: Likewise.
* tests/pot-download1.test: Likewise.
* tests/pot-format-qt1.test: Likewise.
* tests/pot-format-java1.test: Likewise.
* tests/pot-format-java2.test: Likewise.
* tests/pot-format-csharp1.test: Likewise.
* tests/pot-format-tcl1.test: Likewise.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 120 ++++++++++++++++++++++++++++++++++++++++
tests/Makefile.am | 50 ++++++++++++++++-
tests/Makefile.in | 50 ++++++++++++++++-
tests/pot-copyright.test | 12 ++--
tests/pot-download1.test | 23 ++++----
tests/pot-empty.test | 16 +++--
tests/pot-enable1.test | 11 ++-
tests/pot-enable2.test | 11 ++-
tests/pot-format-csharp1.test | 90 ++++++++++++++----------------
tests/pot-format-java1.test | 90 ++++++++++++++----------------
tests/pot-format-java2.test | 90 ++++++++++++++----------------
tests/pot-format-qt1.test | 81 ++++++++++++---------------
tests/pot-format-tcl1.test | 90 ++++++++++++++----------------
tests/pot-linguas.test | 121 ++++++++++++++++++++---------------------
tests/pot-macro-warn.test | 3 +-
tests/pot-msgidbugs.test | 28 +++++----
tests/pot-no-linguas.test | 36 ++++++------
tests/pot-noinst.test | 116 +++++++++++++++++++-------------------
tests/pot-override1.test | 30 +++++-----
tests/pot-samedir.test | 67 ++++++++++------------
tests/pot-topsrcdir.test | 122 ++++++++++++++++++++---------------------
tests/pot-warn1.test | 3 +-
tests/pot-warn2.test | 4 +-
tests/pot-xgettext1.test | 16 +++--
tests/pot-xgettext2.test | 16 +++--
tests/pot-xgettext3.test | 16 +++--
tests/pot-xgettext4.test | 16 +++--
27 files changed, 760 insertions(+), 568 deletions(-)
mode change 100644 => 100755 tests/pot-copyright.test
mode change 100644 => 100755 tests/pot-download1.test
mode change 100644 => 100755 tests/pot-empty.test
mode change 100644 => 100755 tests/pot-enable1.test
mode change 100644 => 100755 tests/pot-enable2.test
mode change 100644 => 100755 tests/pot-format-csharp1.test
mode change 100644 => 100755 tests/pot-format-java1.test
mode change 100644 => 100755 tests/pot-format-java2.test
mode change 100644 => 100755 tests/pot-format-qt1.test
mode change 100644 => 100755 tests/pot-format-tcl1.test
mode change 100644 => 100755 tests/pot-linguas.test
mode change 100644 => 100755 tests/pot-macro-warn.test
mode change 100644 => 100755 tests/pot-msgidbugs.test
mode change 100644 => 100755 tests/pot-no-linguas.test
mode change 100644 => 100755 tests/pot-noinst.test
mode change 100644 => 100755 tests/pot-override1.test
mode change 100644 => 100755 tests/pot-samedir.test
mode change 100644 => 100755 tests/pot-topsrcdir.test
mode change 100644 => 100755 tests/pot-warn1.test
mode change 100644 => 100755 tests/pot-warn2.test
mode change 100644 => 100755 tests/pot-xgettext1.test
mode change 100644 => 100755 tests/pot-xgettext2.test
mode change 100644 => 100755 tests/pot-xgettext3.test
mode change 100644 => 100755 tests/pot-xgettext4.test
diff --git a/ChangeLog b/ChangeLog
index a21b60a..3872db4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,123 @@
+2010-09-06 Stefano Lattarini <address@hidden>
+
+ Internationalization tests: prefer `test ! -r' over `test ! -f'
+ We now use `test ! -r' rather than `test ! -f' to check that
+ a file does not exists (`test ! -e' would be even better, but
+ unfortunately it is unportable to e.g. Solaris /bin/sh).
+ * tests/pot-copyright.test: Prefer `test ! -r' over `test ! -f'.
+ * tests/pot-empty.test: Likewise.
+ * tests/pot-format-csharp1.test: Likewise.
+ * tests/pot-format-java1.test: Likewise.
+ * tests/pot-format-java2.test: Likewise.
+ * tests/pot-format-qt1.test: Likewise.
+ * tests/pot-format-tcl1.test: Likewise.
+ * tests/pot-linguas.test: Likewise.
+ * tests/pot-msgidbugs.test: Likewise.
+ * tests/pot-no-linguas.test: Likewise.
+ * tests/pot-noinst.test: Likewise.
+ * tests/pot-override1.test: Likewise.
+ * tests/pot-samedir.test: Likewise.
+ * tests/pot-topsrcdir.test: Likewise.
+ * tests/pot-xgettext1.test: Likewise.
+ * tests/pot-xgettext2.test: Likewise.
+ * tests/pot-xgettext3.test: Likewise.
+ * tests/pot-xgettext4.test: Likewise.
+
+ Internationalization tests: prefer `make distdir' over `make dist'.
+ Instead of running `make dist', then uncompressing the created
+ tarball, and then grepping the uncompressed tar archive, we can
+ simply run `make distdir' and analyze the contents of the created
+ distibution directory. This is both faster and cleaner.
+ * tests/pot-msgidbugs.test: Test updated to use `make distdir'
+ instead of `make dist' where possible.
+ * tests/pot-no-linguas.test: Likewise.
+ * tests/pot-override1.test: Likewise.
+ * tests/pot-xgettext1.test: Likewise.
+ * tests/pot-xgettext2.test: Likewise.
+ * tests/pot-xgettext3.test: Likewise.
+ * tests/pot-xgettext4.test: Likewise.
+ * tests/pot-download1.test: Likewise, and check the created
+ distdir instead of the distribution tarball (which is not even
+ created anymore).
+ ($distdir): New variable.
+ * tests/pot-format-csharp1.test: Likewise.
+ * tests/pot-format-java1.test: Likewise.
+ * tests/pot-format-java2.test: Likewise.
+ * tests/pot-format-qt1.test: Likewise.
+ * tests/pot-format-tcl1.test: Likewise.
+ * tests/pot-linguas.test: Likewise.
+ * tests/pot-noinst.test: Likewise.
+ * tests/pot-samedir.test: Likewise.
+ * tests/pot-topsrcdir.test: Likewise.
+
+ Fixlets for internationalization tests.
+ * tests/pot-copyright.test: Add trailing `:' command. Use
+ `$MAKE', not bare `make'.
+ * tests/pot-empty.test: Likewise.
+ * tests/pot-download1.test: Likewise. Use `Exit', not `exit'.
+ ($required): Remove gzip, as we must take it for granted anyway.
+ * tests/pot-format-qt1.test: Use `Exit', not `exit'. Use `$MAKE',
+ not bare `make'. Add trailing `:' command. Avoid useless use of
+ cat. Do not redirect output of grep, cmp, etc. to /dev/null.
+ Other minor cosmetic changes.
+ * tests/pot-format-java1.test: Likewise, and ...
+ ($required): Remove gzip, as we must take it for granted anyway.
+ * tests/pot-format-java2.test: Likewise.
+ * tests/pot-format-tcl1.test: Likewise.
+ * tests/pot-linguas.test: Likewise.
+ * tests/pot-noinst.test: Likewise.
+ * tests/pot-samedir.test: Likewise.
+ * tests/pot-topsrcdir.test: Likewise.
+ * tests/pot-format-csharp1.test: Likewise, and quote all literal
+ dots in grep regexps.
+ * tests/pot-enable1.test: Use `$MAKE', not bare `make'. Do not
+ redirect grep output to /dev/null. Add trailing `:' command.
+ (Makefile.am): Explicitly declare phony target as such.
+ * tests/pot-enable2.test: Likewise.
+ * tests/pot-msgidbugs.test: Use `$MAKE', not bare `make'. Avoid
+ useless use of cat. Add trailing `:' command.
+ * tests/pot-xgettext1.test: Likewise.
+ * tests/pot-xgettext2.test: Likewise.
+ * tests/pot-xgettext3.test: Likewise.
+ * tests/pot-xgettext4.test: Likewise.
+ * tests/pot-no-linguas.test: Likewise, and do not redirect grep
+ output to /dev/null.
+ * tests/pot-override1.test: Likewise.
+ * tests/pot-macro-warn.test: Avoid useless use of `AUTOMAKE_run'.
+ Add trailing `:' command.
+ * tests/pot-warn1.test: Likewise.
+ * tests/pot-warn2.test: Likewise.
+
+ List internationalization tests in tests/Makefile.am.
+ * tests/Makefile.am (TESTS, XFAIL_TESTS): Add internationalization
+ tests `pot-*.test' introduced in previous commits.
+
+ Make internationalization tests executable.
+ * tests/pot-macro-warn.test: Made executable.
+ * tests/pot-enable1.test: Likewise.
+ * tests/pot-enable2.test: Likewise.
+ * tests/pot-warn1.test: Likewise.
+ * tests/pot-warn2.test: Likewise.
+ * tests/pot-empty.test: Likewise.
+ * tests/pot-no-linguas.test: Likewise.
+ * tests/pot-linguas.test: Likewise.
+ * tests/pot-noinst.test: Likewise.
+ * tests/pot-topsrcdir.test: Likewise.
+ * tests/pot-samedir.test: Likewise.
+ * tests/pot-override1.test: Likewise.
+ * tests/pot-copyright.test: Likewise.
+ * tests/pot-msgidbugs.test: Likewise.
+ * tests/pot-xgettext1.test: Likewise.
+ * tests/pot-xgettext2.test: Likewise.
+ * tests/pot-xgettext3.test: Likewise.
+ * tests/pot-xgettext4.test: Likewise.
+ * tests/pot-download1.test: Likewise.
+ * tests/pot-format-qt1.test: Likewise.
+ * tests/pot-format-java1.test: Likewise.
+ * tests/pot-format-java2.test: Likewise.
+ * tests/pot-format-csharp1.test: Likewise.
+ * tests/pot-format-tcl1.test: Likewise.
+
2010-09-05 Bruno Haible <address@hidden>
Internationalization tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d86b03b..b9197df 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,7 +21,31 @@ all.test \
auxdir2.test \
cond17.test \
gcj6.test \
-txinfo5.test
+txinfo5.test \
+pot-copyright.test \
+pot-download1.test \
+pot-empty.test \
+pot-enable1.test \
+pot-enable2.test \
+pot-format-csharp1.test \
+pot-format-java1.test \
+pot-format-java2.test \
+pot-format-qt1.test \
+pot-format-tcl1.test \
+pot-linguas.test \
+pot-macro-warn.test \
+pot-msgidbugs.test \
+pot-no-linguas.test \
+pot-noinst.test \
+pot-override1.test \
+pot-samedir.test \
+pot-topsrcdir.test \
+pot-warn1.test \
+pot-warn2.test \
+pot-xgettext1.test \
+pot-xgettext2.test \
+pot-xgettext3.test \
+pot-xgettext4.test
include $(srcdir)/parallel-tests.am
@@ -585,6 +609,30 @@ pluseq7.test \
pluseq8.test \
pluseq9.test \
pluseq10.test \
+pot-copyright.test \
+pot-download1.test \
+pot-empty.test \
+pot-enable1.test \
+pot-enable2.test \
+pot-format-csharp1.test \
+pot-format-java1.test \
+pot-format-java2.test \
+pot-format-qt1.test \
+pot-format-tcl1.test \
+pot-linguas.test \
+pot-macro-warn.test \
+pot-msgidbugs.test \
+pot-no-linguas.test \
+pot-noinst.test \
+pot-override1.test \
+pot-samedir.test \
+pot-topsrcdir.test \
+pot-warn1.test \
+pot-warn2.test \
+pot-xgettext1.test \
+pot-xgettext2.test \
+pot-xgettext3.test \
+pot-xgettext4.test \
postproc.test \
ppf77.test \
pr2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 77ec888..ac14141 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -255,7 +255,31 @@ all.test \
auxdir2.test \
cond17.test \
gcj6.test \
-txinfo5.test
+txinfo5.test \
+pot-copyright.test \
+pot-download1.test \
+pot-empty.test \
+pot-enable1.test \
+pot-enable2.test \
+pot-format-csharp1.test \
+pot-format-java1.test \
+pot-format-java2.test \
+pot-format-qt1.test \
+pot-format-tcl1.test \
+pot-linguas.test \
+pot-macro-warn.test \
+pot-msgidbugs.test \
+pot-no-linguas.test \
+pot-noinst.test \
+pot-override1.test \
+pot-samedir.test \
+pot-topsrcdir.test \
+pot-warn1.test \
+pot-warn2.test \
+pot-xgettext1.test \
+pot-xgettext2.test \
+pot-xgettext3.test \
+pot-xgettext4.test
parallel_tests = check-p.test check10-p.test check11-p.test \
check2-p.test check3-p.test check4-p.test check5-p.test \
@@ -796,6 +820,30 @@ pluseq7.test \
pluseq8.test \
pluseq9.test \
pluseq10.test \
+pot-copyright.test \
+pot-download1.test \
+pot-empty.test \
+pot-enable1.test \
+pot-enable2.test \
+pot-format-csharp1.test \
+pot-format-java1.test \
+pot-format-java2.test \
+pot-format-qt1.test \
+pot-format-tcl1.test \
+pot-linguas.test \
+pot-macro-warn.test \
+pot-msgidbugs.test \
+pot-no-linguas.test \
+pot-noinst.test \
+pot-override1.test \
+pot-samedir.test \
+pot-topsrcdir.test \
+pot-warn1.test \
+pot-warn2.test \
+pot-xgettext1.test \
+pot-xgettext2.test \
+pot-xgettext3.test \
+pot-xgettext4.test \
postproc.test \
ppf77.test \
pr2.test \
diff --git a/tests/pot-copyright.test b/tests/pot-copyright.test
old mode 100644
new mode 100755
index e4f9ff2..68c6b33
--- a/tests/pot-copyright.test
+++ b/tests/pot-copyright.test
@@ -82,25 +82,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make dist" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE dist
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-download1.test b/tests/pot-download1.test
old mode 100644
new mode 100755
index a70845b..8198d7e
--- a/tests/pot-download1.test
+++ b/tests/pot-download1.test
@@ -16,7 +16,6 @@
# Check the download of translations from the Translation Project.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -47,6 +46,8 @@ $ACLOCAL
$AUTOMAKE -a
$AUTOCONF
+distdir=$me-1.0
+
for builddir in . sub; do
if test $builddir = '.'; then
sourcedir='.'
@@ -57,26 +58,24 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
LINGUAS="de" $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that after "make install", a German translation has been installed.
- make install
+ $MAKE install
test -f "$instdir"/share/locale/de/LC_MESSAGES/clisp.mo
- # Check that after "make dist", the tarball does not include the German
+ # Check that the distribution tarball does not include the German
# translation.
- make dist
- gzip -d -c < pot-download1-1.0.tar.gz | tar tf - > filelist
- if grep '^pot-download1-1\.0/clisp-de\.po$' filelist >/dev/null; then
- exit 1
- fi
- rm -f filelist
+ $MAKE distdir
+ test ! -r $distdir/clisp-de.po
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-empty.test b/tests/pot-empty.test
old mode 100644
new mode 100755
index 09bca2b..657753e
--- a/tests/pot-empty.test
+++ b/tests/pot-empty.test
@@ -57,25 +57,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
- make dist
+ $MAKE
+ $MAKE dist
# Check that no .pot file was created.
- test ! -f posub/foo-bar.pot
+ test ! -r posub/foo-bar.pot
- make install
+ $MAKE install
# Check that still, no .pot file was created.
- test ! -f posub/foo-bar.pot
+ test ! -r posub/foo-bar.pot
# Check that no .mo file was installed, not even its directory was created.
test ! -d "$instdir"/share/locale/de/LC_MESSAGES
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-enable1.test b/tests/pot-enable1.test
old mode 100644
new mode 100755
index 77b154d..ff98d83
--- a/tests/pot-enable1.test
+++ b/tests/pot-enable1.test
@@ -23,6 +23,7 @@
set -e
cat > Makefile.am << 'END'
+.PHONY: check-USE_NLS-yes check-USE_NLS-no
check-USE_NLS-yes:
test "@USE_NLS@" = yes
check-USE_NLS-no:
@@ -39,14 +40,16 @@ $AUTOMAKE -a
$AUTOCONF
# Check that the --help output advertises --disable-nls.
-./configure --help | grep ' --disable-nls ' >/dev/null
+./configure --help | grep ' --disable-nls '
# Check that --enable-nls causes USE_NLS to be yes.
./configure --enable-nls
-make check-USE_NLS-yes
+$MAKE check-USE_NLS-yes
-make distclean
+$MAKE distclean
# Check that --disable-nls causes USE_NLS to be no.
./configure --disable-nls
-make check-USE_NLS-no
+$MAKE check-USE_NLS-no
+
+:
diff --git a/tests/pot-enable2.test b/tests/pot-enable2.test
old mode 100644
new mode 100755
index 02bde5b..31ab56b
--- a/tests/pot-enable2.test
+++ b/tests/pot-enable2.test
@@ -23,6 +23,7 @@
set -e
cat > Makefile.am << 'END'
+.PHONY: check-USE_NLS-yes check-USE_NLS-no
check-USE_NLS-yes:
test "@USE_NLS@" = yes
check-USE_NLS-no:
@@ -39,14 +40,16 @@ $AUTOMAKE -a
$AUTOCONF
# Check that the --help output advertises --disable-nls.
-./configure --help | grep ' --disable-nls ' >/dev/null
+./configure --help | grep ' --disable-nls '
# Check that --enable-nls causes USE_NLS to be yes.
./configure --enable-nls
-make check-USE_NLS-yes
+$MAKE check-USE_NLS-yes
-make distclean
+$MAKE distclean
# Check that --disable-nls causes USE_NLS to be no.
./configure --disable-nls
-make check-USE_NLS-no
+$MAKE check-USE_NLS-no
+
+:
diff --git a/tests/pot-format-csharp1.test b/tests/pot-format-csharp1.test
old mode 100644
new mode 100755
index 8c7f6c7..342a2e5
--- a/tests/pot-format-csharp1.test
+++ b/tests/pot-format-csharp1.test
@@ -16,7 +16,6 @@
# Check the creation of compiled message catalogs in C# format.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -114,6 +113,8 @@ msgid "Hello, world!"
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -125,99 +126,90 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot file, .po files
# and .resources.dll files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.resources.dll
+ test ! -r $sourcedir/posub/foo-bar-de.resources.dll
test -f $sourcedir/posub/de/foo-bar.resources.dll
test -f $sourcedir/posub/address@hidden
- test ! -f $sourcedir/posub/address@hidden
+ test ! -r $sourcedir/posub/address@hidden
test -f $sourcedir/posub/fr-CA-Latn/foo-bar.resources.dll
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/address@hidden
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/address@hidden
if test -z "$config_options"; then
# Check that "make install" installed de,po and address@hidden but not
es.po.
test -f "$instdir"/lib/pot-format-csharp1/de/foo-bar.resources.dll
test -f
"$instdir"/lib/pot-format-csharp1/fr-CA-Latn/foo-bar.resources.dll
- test ! -f "$instdir"/lib/pot-format-csharp1/es/foo-bar.resources.dll
+ test ! -r "$instdir"/lib/pot-format-csharp1/es/foo-bar.resources.dll
else
# Check that "make install" installed de.po but not address@hidden nor
es.po.
test -f "$instdir"/lib/pot-format-csharp1/de/foo-bar.resources.dll
- test ! -f
"$instdir"/lib/pot-format-csharp1/fr-CA-Latn/foo-bar.resources.dll
- test ! -f "$instdir"/lib/pot-format-csharp1/es/foo-bar.resources.dll
+ test ! -r
"$instdir"/lib/pot-format-csharp1/fr-CA-Latn/foo-bar.resources.dll
+ test ! -r "$instdir"/lib/pot-format-csharp1/es/foo-bar.resources.dll
fi
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.resources.dll
- test ! -f
"$instdir"/share/locale/address@hidden/LC_MESSAGES/foo-bar.resources.dll
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.resources.dll
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/address@hidden/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.resources.dll
+ test ! -r
"$instdir"/share/locale/address@hidden/LC_MESSAGES/foo-bar.resources.dll
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.resources.dll
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/address@hidden/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.resources.dll
+ test ! -r $sourcedir/posub/foo-bar-de.resources.dll
test -f $sourcedir/posub/de/foo-bar.resources.dll
test -f $sourcedir/posub/address@hidden
- test ! -f $sourcedir/posub/address@hidden
+ test ! -r $sourcedir/posub/address@hidden
test -f $sourcedir/posub/fr-CA-Latn/foo-bar.resources.dll
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/address@hidden
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/address@hidden
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,resources.dll}
# but not the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-format-csharp1-1.0.tar.gz | tar tf - > filelist
- grep '^pot-format-csharp1-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-format-csharp1-1\.0/posub/de/foo-bar\.resources.dll$' filelist
>/dev/null
- grep '^pot-format-csharp1-1\.0/posub/address@hidden' filelist >/dev/null
- grep '^pot-format-csharp1-1\.0/posub/fr-CA-Latn/foo-bar\.resources.dll$'
filelist >/dev/null
- if grep '^pot-format-csharp1-1\.0/posub/foo-bar-es\.po$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-csharp1-1\.0/posub/es/foo-bar\.resources.dll$'
filelist >/dev/null; then
- exit 1
- fi
- if grep '^pot-format-csharp1-1\.0/posub/foo-bar-de\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-csharp1-1\.0/posub/address@hidden' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-csharp1-1\.0/posub/foo-bar-es\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/de/foo-bar.resources.dll
+ test -f $distdir/posub/address@hidden
+ test -f $distdir/posub/fr-CA-Latn/foo-bar.resources.dll
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/es/foo-bar.resources.dll
+ test ! -r $distdir/posub/foo-bar-de.mo
+ test ! -r $distdir/posub/address@hidden
+ test ! -r $distdir/posub/foo-bar-es.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-format-java1.test b/tests/pot-format-java1.test
old mode 100644
new mode 100755
index 6a9259b..5316893
--- a/tests/pot-format-java1.test
+++ b/tests/pot-format-java1.test
@@ -18,7 +18,6 @@
# FIXME: Resource names with a dash maybe don't work. If so, it should be
# mentioned in the documentation.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -115,6 +114,8 @@ msgid "Hello, world!"
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -126,99 +127,90 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot file, .po files
# and .properties files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.properties
+ test ! -r $sourcedir/posub/foo-bar-de.properties
test -f $sourcedir/posub/foo-bar_de.properties
test -f $sourcedir/posub/foo-bar-fr.po
- test ! -f $sourcedir/posub/foo-bar-fr.properties
+ test ! -r $sourcedir/posub/foo-bar-fr.properties
test -f $sourcedir/posub/foo-bar_fr.properties
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
if test -z "$config_options"; then
# Check that "make install" installed de,po and fr.po but not es.po.
test -f "$instdir"/share/pot-format-java1/resources/foo-bar_de.properties
test -f "$instdir"/share/pot-format-java1/resources/foo-bar_fr.properties
- test ! -f
"$instdir"/share/pot-format-java1/resources/foo-bar_es.properties
+ test ! -r
"$instdir"/share/pot-format-java1/resources/foo-bar_es.properties
else
# Check that "make install" installed de.po but not fr.po nor es.po.
test -f "$instdir"/share/pot-format-java1/resources/foo-bar_de.properties
- test ! -f
"$instdir"/share/pot-format-java1/resources/foo-bar_fr.properties
- test ! -f
"$instdir"/share/pot-format-java1/resources/foo-bar_es.properties
+ test ! -r
"$instdir"/share/pot-format-java1/resources/foo-bar_fr.properties
+ test ! -r
"$instdir"/share/pot-format-java1/resources/foo-bar_es.properties
fi
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.properties
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.properties
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.properties
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.properties
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.properties
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.properties
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.properties
+ test ! -r $sourcedir/posub/foo-bar-de.properties
test -f $sourcedir/posub/foo-bar_de.properties
test -f $sourcedir/posub/foo-bar-fr.po
- test ! -f $sourcedir/posub/foo-bar-fr.properties
+ test ! -r $sourcedir/posub/foo-bar-fr.properties
test -f $sourcedir/posub/foo-bar_fr.properties
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,properties}
# but not the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-format-java1-1.0.tar.gz | tar tf - > filelist
- grep '^pot-format-java1-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-format-java1-1\.0/posub/foo-bar_de\.properties$' filelist
>/dev/null
- grep '^pot-format-java1-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-format-java1-1\.0/posub/foo-bar_fr\.properties$' filelist
>/dev/null
- if grep '^pot-format-java1-1\.0/posub/foo-bar-es\.po$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java1-1\.0/posub/foo-bar_es\.properties$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java1-1\.0/posub/foo-bar-de\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java1-1\.0/posub/foo-bar-fr\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java1-1\.0/posub/foo-bar-es\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar_de.properties
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar_fr.properties
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar_es.properties
+ test ! -r $distdir/posub/foo-bar-de.mo
+ test ! -r $distdir/posub/foo-bar-fr.mo
+ test ! -r $distdir/posub/foo-bar-es.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-format-java2.test b/tests/pot-format-java2.test
old mode 100644
new mode 100755
index e05d08c..5952532
--- a/tests/pot-format-java2.test
+++ b/tests/pot-format-java2.test
@@ -18,7 +18,6 @@
# FIXME: Class names with a dash probably don't work. If so, it should be
# mentioned in the documentation.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -115,6 +114,8 @@ msgid "Hello, world!"
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -126,99 +127,90 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot file, .po files
# and .class files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.class
+ test ! -r $sourcedir/posub/foo-bar-de.class
test -f $sourcedir/posub/foo-bar_de.class
test -f $sourcedir/posub/foo-bar-fr.po
- test ! -f $sourcedir/posub/foo-bar-fr.class
+ test ! -r $sourcedir/posub/foo-bar-fr.class
test -f $sourcedir/posub/foo-bar_fr.class
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
if test -z "$config_options"; then
# Check that "make install" installed de,po and fr.po but not es.po.
test -f "$instdir"/share/pot-format-java2/resources/foo-bar_de.class
test -f "$instdir"/share/pot-format-java2/resources/foo-bar_fr.class
- test ! -f "$instdir"/share/pot-format-java2/resources/foo-bar_es.class
+ test ! -r "$instdir"/share/pot-format-java2/resources/foo-bar_es.class
else
# Check that "make install" installed de.po but not fr.po nor es.po.
test -f "$instdir"/share/pot-format-java2/resources/foo-bar_de.class
- test ! -f "$instdir"/share/pot-format-java2/resources/foo-bar_fr.class
- test ! -f "$instdir"/share/pot-format-java2/resources/foo-bar_es.class
+ test ! -r "$instdir"/share/pot-format-java2/resources/foo-bar_fr.class
+ test ! -r "$instdir"/share/pot-format-java2/resources/foo-bar_es.class
fi
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.class
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.class
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.class
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.class
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.class
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.class
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.class
+ test ! -r $sourcedir/posub/foo-bar-de.class
test -f $sourcedir/posub/foo-bar_de.class
test -f $sourcedir/posub/foo-bar-fr.po
- test ! -f $sourcedir/posub/foo-bar-fr.class
+ test ! -r $sourcedir/posub/foo-bar-fr.class
test -f $sourcedir/posub/foo-bar_fr.class
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,class} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-format-java2-1.0.tar.gz | tar tf - > filelist
- grep '^pot-format-java2-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-format-java2-1\.0/posub/foo-bar_de\.class$' filelist >/dev/null
- grep '^pot-format-java2-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-format-java2-1\.0/posub/foo-bar_fr\.class$' filelist >/dev/null
- if grep '^pot-format-java2-1\.0/posub/foo-bar-es\.po$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java2-1\.0/posub/foo-bar_es\.class$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java2-1\.0/posub/foo-bar-de\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java2-1\.0/posub/foo-bar-fr\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-java2-1\.0/posub/foo-bar-es\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar_de.class
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar_fr.class
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar_es.class
+ test ! -r $distdir/posub/foo-bar-de.mo
+ test ! -r $distdir/posub/foo-bar-fr.mo
+ test ! -r $distdir/posub/foo-bar-es.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-format-qt1.test b/tests/pot-format-qt1.test
old mode 100644
new mode 100755
index 797a347..6df1af2
--- a/tests/pot-format-qt1.test
+++ b/tests/pot-format-qt1.test
@@ -139,6 +139,8 @@ msgid "Hello, world!"
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -150,18 +152,18 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot file, .po files
# and .qm files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -169,36 +171,36 @@ for builddir in . sub; do
test -f $sourcedir/posub/foo-bar-de.qm
test -f $sourcedir/posub/foo-bar-fr.po
test -f $sourcedir/posub/foo-bar-fr.qm
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
if test -z "$config_options"; then
# Check that "make install" installed de,po and fr.po but not es.po.
test -f "$instdir"/share/pot-format-qt1/locale/foo-bar_de.qm
test -f "$instdir"/share/pot-format-qt1/locale/foo-bar_fr.qm
- test ! -f "$instdir"/share/pot-format-qt1/locale/foo-bar_es.qm
+ test ! -r "$instdir"/share/pot-format-qt1/locale/foo-bar_es.qm
else
# Check that "make install" installed de.po but not fr.po nor es.po.
test -f "$instdir"/share/pot-format-qt1/locale/foo-bar_de.qm
- test ! -f "$instdir"/share/pot-format-qt1/locale/foo-bar_fr.qm
- test ! -f "$instdir"/share/pot-format-qt1/locale/foo-bar_es.qm
+ test ! -r "$instdir"/share/pot-format-qt1/locale/foo-bar_fr.qm
+ test ! -r "$instdir"/share/pot-format-qt1/locale/foo-bar_es.qm
fi
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.qm
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.qm
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.qm
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.qm
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.qm
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.qm
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -206,39 +208,30 @@ for builddir in . sub; do
test -f $sourcedir/posub/foo-bar-de.qm
test -f $sourcedir/posub/foo-bar-fr.po
test -f $sourcedir/posub/foo-bar-fr.qm
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,qm} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-format-qt1-1.0.tar.gz | tar tf - > filelist
- grep '^pot-format-qt1-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-format-qt1-1\.0/posub/foo-bar-de\.qm$' filelist >/dev/null
- grep '^pot-format-qt1-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-format-qt1-1\.0/posub/foo-bar-fr\.qm$' filelist >/dev/null
- if grep '^pot-format-qt1-1\.0/posub/foo-bar-es\.po$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-qt1-1\.0/posub/foo-bar-es\.qm$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-qt1-1\.0/posub/foo-bar-de\.mo$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-qt1-1\.0/posub/foo-bar-fr\.mo$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-qt1-1\.0/posub/foo-bar-es\.mo$' filelist >/dev/null;
then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar-de.qm
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar-fr.qm
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar-es.qm
+ test ! -r $distdir/posub/foo-bar-de.mo
+ test ! -r $distdir/posub/foo-bar-fr.mo
+ test ! -r $distdir/posub/foo-bar-es.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-format-tcl1.test b/tests/pot-format-tcl1.test
old mode 100644
new mode 100755
index 109245e..6f9f4d3
--- a/tests/pot-format-tcl1.test
+++ b/tests/pot-format-tcl1.test
@@ -16,7 +16,6 @@
# Check the creation of compiled message catalogs in Tcl format.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -110,6 +109,8 @@ msgid "Hello, world!"
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -121,99 +122,90 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot file, .po files
# and .msg files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.msg
+ test ! -r $sourcedir/posub/foo-bar-de.msg
test -f $sourcedir/posub/foo-bar/de.msg
test -f $sourcedir/posub/foo-bar-fr_CA.po
- test ! -f $sourcedir/posub/foo-bar-fr_CA.msg
+ test ! -r $sourcedir/posub/foo-bar-fr_CA.msg
test -f $sourcedir/posub/foo-bar/fr_ca.msg
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr_CA.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr_CA.mo
if test -z "$config_options"; then
# Check that "make install" installed de,po and fr_CA.po but not es.po.
test -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/de.msg
test -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/fr_ca.msg
- test ! -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/es.msg
+ test ! -r "$instdir"/share/pot-format-tcl1/msgs/foo-bar/es.msg
else
# Check that "make install" installed de.po but not fr_CA.po nor es.po.
test -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/de.msg
- test ! -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/fr_ca.msg
- test ! -f "$instdir"/share/pot-format-tcl1/msgs/foo-bar/es.msg
+ test ! -r "$instdir"/share/pot-format-tcl1/msgs/foo-bar/fr_ca.msg
+ test ! -r "$instdir"/share/pot-format-tcl1/msgs/foo-bar/es.msg
fi
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.msg
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.msg
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.msg
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.msg
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.msg
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.msg
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
test -f $sourcedir/posub/foo-bar-de.po
- test ! -f $sourcedir/posub/foo-bar-de.msg
+ test ! -r $sourcedir/posub/foo-bar-de.msg
test -f $sourcedir/posub/foo-bar/de.msg
test -f $sourcedir/posub/foo-bar-fr_CA.po
- test ! -f $sourcedir/posub/foo-bar-fr_CA.msg
+ test ! -r $sourcedir/posub/foo-bar-fr_CA.msg
test -f $sourcedir/posub/foo-bar/fr_ca.msg
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr_CA.mo
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr_CA.mo
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,msg} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-format-tcl1-1.0.tar.gz | tar tf - > filelist
- grep '^pot-format-tcl1-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-format-tcl1-1\.0/posub/foo-bar/de\.msg$' filelist >/dev/null
- grep '^pot-format-tcl1-1\.0/posub/foo-bar-fr_CA\.po$' filelist >/dev/null
- grep '^pot-format-tcl1-1\.0/posub/foo-bar/fr_ca\.msg$' filelist >/dev/null
- if grep '^pot-format-tcl1-1\.0/posub/foo-bar-es\.po$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-tcl1-1\.0/posub/foo-bar/es\.msg$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-tcl1-1\.0/posub/foo-bar-de\.mo$' filelist >/dev/null;
then
- exit 1
- fi
- if grep '^pot-format-tcl1-1\.0/posub/foo-bar-fr_CA\.mo$' filelist
>/dev/null; then
- exit 1
- fi
- if grep '^pot-format-tcl1-1\.0/posub/foo-bar-es\.mo$' filelist >/dev/null;
then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar/de.msg
+ test -f $distdir/posub/foo-bar-fr_CA.po
+ test -f $distdir/posub/foo-bar/fr_ca.msg
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar/es.msg
+ test ! -r $distdir/posub/foo-bar-de.mo
+ test ! -r $distdir/posub/foo-bar-fr_CA.mo
+ test ! -r $distdir/posub/foo-bar-es.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-linguas.test b/tests/pot-linguas.test
old mode 100644
new mode 100755
index 428152b..1df57fb
--- a/tests/pot-linguas.test
+++ b/tests/pot-linguas.test
@@ -22,7 +22,6 @@
# FIXME: Should "make install" really update the PO files and MO files?
# Current po/Makefile.in.in does not do it.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -121,6 +120,8 @@ msgid "See the documentation for details."
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -132,7 +133,7 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
cat > $sourcedir/src/main.c << 'END'
#include <stdio.h>
@@ -148,11 +149,11 @@ END
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -165,23 +166,23 @@ END
# Check that "make install" installed de,po and fr.po but not es.po.
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
test -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
else
# Check that "make install" installed de.po but not fr.po nor es.po.
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
fi
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/posub/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -192,18 +193,12 @@ END
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,mo} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-linguas-1.0.tar.gz | tar tf - > filelist
- grep '^pot-linguas-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-linguas-1\.0/posub/foo-bar-de\.mo$' filelist >/dev/null
- grep '^pot-linguas-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-linguas-1\.0/posub/foo-bar-fr\.mo$' filelist >/dev/null
- if grep '^pot-linguas-1\.0/posub/foo-bar-es\.po$' filelist >/dev/null; then
- exit 1
- fi
- if grep '^pot-linguas-1\.0/posub/foo-bar-es\.mo$' filelist >/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar-de.mo
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar-fr.mo
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar-es.mo
# Try modifying a source file.
cat > $sourcedir/src/main.c << 'END'
@@ -224,32 +219,33 @@ END
cp -p $sourcedir/posub/foo-bar-fr.mo $sourcedir/posub/foo-bar-fr.mobak
cp -p $sourcedir/posub/foo-bar-es.po $sourcedir/posub/foo-bar-es.pobak
cp -p $sourcedir/posub/foo-bar-es.mo $sourcedir/posub/foo-bar-es.mobak
- make
+ $MAKE
diff $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
+ cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
+ cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
# Check that "make install" updates the POT file, the PO files, and the
# MO files listed in the _LINGUAS variable, regardless whether LINGUAS
# was specified or not.
- make install
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
- cat $sourcedir/posub/foo-bar-de.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null; then
- exit 1
- fi
- cat $sourcedir/posub/foo-bar-fr.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null; then
- exit 1
- fi
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
-
- # Check that "make dist" updates the POT file, the PO files, and the
+ $MAKE install
+ grep great $sourcedir/posub/foo-bar.pot
+ # NOTE: This is *not* a useless use of cat. The *.po files can contain
+ # non-ASCII characters, which might cause problems with some `grep'
+ # programs. BSD `grep' works from a pipe, but not a seekable file.
+ # GNU or BSD `grep -a' works on files, but is not portable.
+ cat $sourcedir/posub/foo-bar-de.po | grep great
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo &&
Exit 1
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-fr.po | grep great
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo &&
Exit 1
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
+
+ # Check that "make distdir" updates the POT file, the PO files, and the
# MO files listed in the _LINGUAS variable, regardless whether LINGUAS
# was specified or not.
cp -p $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
@@ -257,30 +253,31 @@ END
cp -p $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
cp -p $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
cp -p $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
- make dist
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
- cat $sourcedir/posub/foo-bar-de.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null; then
- exit 1
- fi
- cat $sourcedir/posub/foo-bar-fr.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null; then
- exit 1
- fi
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
+ $MAKE distdir
+ grep great $sourcedir/posub/foo-bar.pot
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-de.po | grep great
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo &&
Exit 1
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-fr.po | grep great
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo &&
Exit 1
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
# Check that the updated PO files contain 'previous msgid' fields.
- cat $sourcedir/posub/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
- cat $sourcedir/posub/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
+ cat $sourcedir/posub/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- rm -f $sourcedir/posub/foo-bar.potbak $sourcedir/posub/*.pobak
$sourcedir/posub/*.mobak
- make distclean
+ rm -f $sourcedir/posub/foo-bar.potbak $sourcedir/posub/*.[mp]obak
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-macro-warn.test b/tests/pot-macro-warn.test
old mode 100644
new mode 100755
index 41fb35f..caecab4
--- a/tests/pot-macro-warn.test
+++ b/tests/pot-macro-warn.test
@@ -50,5 +50,6 @@ END
$ACLOCAL
# Check that there is no warning any more.
+$AUTOMAKE -Werror
-AUTOMAKE_run 0 -Werror
+:
diff --git a/tests/pot-msgidbugs.test b/tests/pot-msgidbugs.test
old mode 100644
new mode 100755
index 1bf5334..36811e9
--- a/tests/pot-msgidbugs.test
+++ b/tests/pot-msgidbugs.test
@@ -85,25 +85,25 @@ for builddir in . sub1; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
@@ -148,25 +148,27 @@ for builddir in . sub2; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-no-linguas.test b/tests/pot-no-linguas.test
old mode 100644
new mode 100755
index f64588a..d604c9e
--- a/tests/pot-no-linguas.test
+++ b/tests/pot-no-linguas.test
@@ -102,7 +102,7 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
cat > $sourcedir/src/main.c << 'END'
#include <stdio.h>
@@ -113,15 +113,15 @@ int main ()
}
END
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -129,17 +129,17 @@ END
# Check that "make install" creates the expected .pot file.
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Check that no .mo file was installed, although posub/foo-bar-de.po and
# posub/foo-bar-de.mo exist.
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
# Try modifying a source file.
cat > $sourcedir/src/main.c << 'END'
@@ -153,24 +153,26 @@ END
# Check that "make" does not rebuild the POT file.
cp -p $sourcedir/posub/foo-bar.pot $sourcedir/posub/foo-bar.potbak
- make
+ $MAKE
diff $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- # Check that "make dist" updates the POT file.
- make dist
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
+ # Check that "make distdir" updates the POT file.
+ $MAKE distdir
+ grep great $sourcedir/posub/foo-bar.pot
# Check that "make install" updates the POT file.
cp -p $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- make install
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
+ $MAKE install
+ grep great $sourcedir/posub/foo-bar.pot
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
rm -f $sourcedir/posub/foo-bar.potbak
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-noinst.test b/tests/pot-noinst.test
old mode 100644
new mode 100755
index 9c1c922..6688c6c
--- a/tests/pot-noinst.test
+++ b/tests/pot-noinst.test
@@ -19,7 +19,6 @@
# configure time has no effect. Otherwise, everything is the same as in the
# pot-linguas test.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -118,6 +117,8 @@ msgid "See the documentation for details."
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -129,7 +130,7 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
cat > $sourcedir/src/main.c << 'END'
#include <stdio.h>
@@ -143,27 +144,27 @@ END
# Check that "make install" does not create the .pot file and .mo files.
# (They are not needed for installation.)
- make install
+ $MAKE install
- test ! -f $sourcedir/posub/foo-bar.pot
- test ! -f $sourcedir/posub/foo-bar-de.mo
- test ! -f $sourcedir/posub/foo-bar-fr.mo
+ test ! -r $sourcedir/posub/foo-bar.pot
+ test ! -r $sourcedir/posub/foo-bar-de.mo
+ test ! -r $sourcedir/posub/foo-bar-fr.mo
# Check that "make install" installed none of de.po, fr.po, es.po.
- test ! -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
- # Check that "make dist" creates the expected .pot file, .po files
+ # Check that "make distdir" creates the expected .pot file, .po files
# and .mo files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C
tr -d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
@@ -174,18 +175,13 @@ END
# Check that the tarball contains posub/foo-bar-{de,fr}.{po,mo} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-noinst-1.0.tar.gz | tar tf - > filelist
- grep '^pot-noinst-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-noinst-1\.0/posub/foo-bar-de\.mo$' filelist >/dev/null
- grep '^pot-noinst-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-noinst-1\.0/posub/foo-bar-fr\.mo$' filelist >/dev/null
- if grep '^pot-noinst-1\.0/posub/foo-bar-es\.po$' filelist >/dev/null; then
- exit 1
- fi
- if grep '^pot-noinst-1\.0/posub/foo-bar-es\.mo$' filelist >/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar-de.mo
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar-fr.mo
+ test ! -r $distdir/posub/foo-bar-es.po
+ test ! -r $distdir/posub/foo-bar-es.mo
# Try modifying a source file.
cat > $sourcedir/src/main.c << 'END'
@@ -206,53 +202,57 @@ END
cp -p $sourcedir/posub/foo-bar-fr.mo $sourcedir/posub/foo-bar-fr.mobak
cp -p $sourcedir/posub/foo-bar-es.po $sourcedir/posub/foo-bar-es.pobak
cp -p $sourcedir/posub/foo-bar-es.mo $sourcedir/posub/foo-bar-es.mobak
- make
+ $MAKE
diff $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
+ cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
+ cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
# Check that "make install" does not update the POT file, the PO files,
# and the MO files.
- make install
+ $MAKE install
diff $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
-
- # Check that "make dist" updates the POT file, the PO files, and the
+ cmp $sourcedir/posub/foo-bar-de.pobak $sourcedir/posub/foo-bar-de.po
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
+ cmp $sourcedir/posub/foo-bar-fr.pobak $sourcedir/posub/foo-bar-fr.po
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
+
+ # Check that "make distdir" updates the POT file, the PO files, and the
# MO files listed in the _LINGUAS variable, regardless whether LINGUAS
# was specified or not.
- make dist
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
- cat $sourcedir/posub/foo-bar-de.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo
>/dev/null; then
- exit 1
- fi
- cat $sourcedir/posub/foo-bar-fr.po | grep great >/dev/null
- if cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo
>/dev/null; then
- exit 1
- fi
- cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
>/dev/null
- cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
>/dev/null
+ $MAKE distdir
+ grep great $sourcedir/posub/foo-bar.pot
+ # NOTE: This is *not* a useless use of cat. The *.po files can contain
+ # non-ASCII characters, which might cause problems with some `grep'
+ # programs. BSD `grep' works from a pipe, but not a seekable file.
+ # GNU or BSD `grep -a' works on files, but is not portable.
+ cat $sourcedir/posub/foo-bar-de.po | grep great
+ cmp $sourcedir/posub/foo-bar-de.mobak $sourcedir/posub/foo-bar-de.mo &&
Exit 1
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-fr.po | grep great
+ cmp $sourcedir/posub/foo-bar-fr.mobak $sourcedir/posub/foo-bar-fr.mo &&
Exit 1
+ cmp $sourcedir/posub/foo-bar-es.pobak $sourcedir/posub/foo-bar-es.po
+ cmp $sourcedir/posub/foo-bar-es.mobak $sourcedir/posub/foo-bar-es.mo
# Check that the updated PO files contain 'previous msgid' fields.
- cat $sourcedir/posub/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
- cat $sourcedir/posub/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/posub/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
+ cat $sourcedir/posub/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- rm -f $sourcedir/posub/foo-bar.potbak $sourcedir/posub/*.pobak
$sourcedir/posub/*.mobak
- make distclean
+ rm -f $sourcedir/posub/foo-bar.potbak $sourcedir/posub/*.[mp]obak
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-override1.test b/tests/pot-override1.test
old mode 100644
new mode 100755
index 6389f54..80dde7f
--- a/tests/pot-override1.test
+++ b/tests/pot-override1.test
@@ -79,7 +79,7 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
cat > $sourcedir/src/main.c << 'END'
#include <stdio.h>
@@ -90,24 +90,24 @@ int main ()
}
END
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
diff $sourcedir/posub/foo-bar.pot $sourcedir/expected
rm -f $sourcedir/posub/foo-bar.pot
# Check that "make install" creates the expected .pot file.
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
diff $sourcedir/posub/foo-bar.pot $sourcedir/expected
# Try modifying a source file.
@@ -122,24 +122,26 @@ END
# Check that "make" does not rebuild the POT file.
cp -p $sourcedir/posub/foo-bar.pot $sourcedir/posub/foo-bar.potbak
- make
+ $MAKE
diff $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- # Check that "make dist" updates the POT file.
- make dist
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
+ # Check that "make distdir" updates the POT file.
+ $MAKE distdir
+ grep great $sourcedir/posub/foo-bar.pot
# Check that "make install" updates the POT file.
cp -p $sourcedir/posub/foo-bar.potbak $sourcedir/posub/foo-bar.pot
- make install
- cat $sourcedir/posub/foo-bar.pot | grep great >/dev/null
+ $MAKE install
+ grep great $sourcedir/posub/foo-bar.pot
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
rm -f $sourcedir/posub/foo-bar.potbak
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-samedir.test b/tests/pot-samedir.test
old mode 100644
new mode 100755
index 900be4f..424e582
--- a/tests/pot-samedir.test
+++ b/tests/pot-samedir.test
@@ -16,7 +16,6 @@
# Check that different .pot files in the same directory don't collide.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -148,6 +147,8 @@ msgid "See the documentation for details."
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
if test $builddir = '.'; then
sourcedir='.'
@@ -158,23 +159,23 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
# Check that "make install" creates the expected .pot files and .mo files.
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected1
rm -f actual
test -f $sourcedir/posub/foo-baz.pot
- test $builddir = '.' || test ! -f posub/foo-baz.pot
- cat $sourcedir/posub/foo-baz.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-baz.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-baz.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected2
rm -f actual
@@ -187,47 +188,39 @@ for builddir in . sub; do
# languages.
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
test -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/it/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/it/LC_MESSAGES/foo-bar.mo
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-baz.mo
test -f "$instdir"/share/locale/it/LC_MESSAGES/foo-baz.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-baz.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-baz.mo
# Check that the two .mo files for the same language are different.
- if cmp "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
"$instdir"/share/locale/de/LC_MESSAGES/foo-baz.mo >/dev/null; then
- exit 1
- fi
+ cmp "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo \
+ "$instdir"/share/locale/de/LC_MESSAGES/foo-baz.mo && Exit 1
- make dist
+ $MAKE distdir
# Check that the tarball contains the .po files and .mo files for the
# specified languages, but not more.
- gzip -d -c < pot-samedir-1.0.tar.gz | tar tf - > filelist
- grep '^pot-samedir-1\.0/posub/foo-bar-de\.po$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-bar-de\.mo$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-bar-fr\.po$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-bar-fr\.mo$' filelist >/dev/null
- if grep '^pot-samedir-1\.0/posub/foo-bar-it\.po$' filelist >/dev/null; then
- exit 1
- fi
- if grep '^pot-samedir-1\.0/posub/foo-bar-it\.mo$' filelist >/dev/null; then
- exit 1
- fi
- grep '^pot-samedir-1\.0/posub/foo-baz-de\.po$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-baz-de\.mo$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-baz-it\.po$' filelist >/dev/null
- grep '^pot-samedir-1\.0/posub/foo-baz-it\.mo$' filelist >/dev/null
- if grep '^pot-samedir-1\.0/posub/foo-baz-fr\.po$' filelist >/dev/null; then
- exit 1
- fi
- if grep '^pot-samedir-1\.0/posub/foo-baz-fr\.mo$' filelist >/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/posub/foo-bar-de.po
+ test -f $distdir/posub/foo-bar-de.mo
+ test -f $distdir/posub/foo-bar-fr.po
+ test -f $distdir/posub/foo-bar-fr.mo
+ test -f $distdir/posub/foo-baz-de.po
+ test -f $distdir/posub/foo-baz-de.mo
+ test -f $distdir/posub/foo-baz-it.po
+ test -f $distdir/posub/foo-baz-it.mo
+ test ! -r $distdir/posub/foo-bar-it.po
+ test ! -r $distdir/posub/foo-bar-it.mo
+ test ! -r $distdir/posub/foo-baz-fr.po
+ test ! -r $distdir/posub/foo-baz-fr.mo
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-topsrcdir.test b/tests/pot-topsrcdir.test
old mode 100644
new mode 100755
index 7236eb5..4e55c6b
--- a/tests/pot-topsrcdir.test
+++ b/tests/pot-topsrcdir.test
@@ -20,7 +20,6 @@
# FIXME: Should "make install" really update the PO files and MO files?
# Current po/Makefile.in.in does not do it.
-required='gzip'
. ./defs || Exit 1
set -e
@@ -118,6 +117,8 @@ msgid "See the documentation for details."
msgstr ""
END
+distdir=$me-1.0
+
for builddir in . sub; do
for config_options in '' 'LINGUAS="es de"'; do
if test $builddir = '.'; then
@@ -129,7 +130,7 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
env $config_options $sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
cat > $sourcedir/src/main.c << 'END'
#include <stdio.h>
@@ -145,11 +146,11 @@ END
# (They are created under $sourcedir, because the files are distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make install
+ $MAKE install
test -f $sourcedir/foo-bar.pot
- test $builddir = '.' || test ! -f foo-bar.pot
- cat $sourcedir/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d
'\r' > actual
+ test $builddir = '.' || test ! -r foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/foo-bar.pot | LC_ALL=C tr -d '\r' >
actual
diff actual $sourcedir/expected
rm -f actual
@@ -162,23 +163,23 @@ END
# Check that "make install" installed de,po and fr.po but not es.po.
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
test -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
else
# Check that "make install" installed de.po but not fr.po nor es.po.
test -f "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
- test ! -f "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/fr/LC_MESSAGES/foo-bar.mo
+ test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
fi
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
rm -f $sourcedir/foo-bar.pot
- make dist
+ $MAKE distdir
test -f $sourcedir/foo-bar.pot
- test $builddir = '.' || test ! -f foo-bar.pot
- cat $sourcedir/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d
'\r' > actual
+ test $builddir = '.' || test ! -r foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/foo-bar.pot | LC_ALL=C tr -d '\r' >
actual
diff actual $sourcedir/expected
rm -f actual
@@ -189,18 +190,13 @@ END
# Check that the tarball contains foo-bar-{de,fr}.{po,mo} but not
# the others, regardless whether LINGUAS was specified or not.
- gzip -d -c < pot-linguas-1.0.tar.gz | tar tf - > filelist
- grep '^foo-bar-de\.po$' filelist >/dev/null
- grep '^foo-bar-de\.mo$' filelist >/dev/null
- grep '^foo-bar-fr\.po$' filelist >/dev/null
- grep '^foo-bar-fr\.mo$' filelist >/dev/null
- if grep '^foo-bar-es\.po$' filelist >/dev/null; then
- exit 1
- fi
- if grep '^foo-bar-es\.mo$' filelist >/dev/null; then
- exit 1
- fi
- rm -f filelist
+ test -d $distdir # sanity check
+ test -f $distdir/foo-bar-de.po
+ test -f $distdir/foo-bar-de.mo
+ test -f $distdir/foo-bar-fr.po
+ test -f $distdir/foo-bar-fr.mo
+ test ! -r $distdir/foo-bar-es.po
+ test ! -r $distdir/foo-bar-es.mo
# Try modifying a source file.
cat > $sourcedir/src/main.c << 'END'
@@ -221,32 +217,33 @@ END
cp -p $sourcedir/foo-bar-fr.mo $sourcedir/foo-bar-fr.mobak
cp -p $sourcedir/foo-bar-es.po $sourcedir/foo-bar-es.pobak
cp -p $sourcedir/foo-bar-es.mo $sourcedir/foo-bar-es.mobak
- make
+ $MAKE
diff $sourcedir/foo-bar.potbak $sourcedir/foo-bar.pot
- cmp $sourcedir/foo-bar-de.pobak $sourcedir/foo-bar-de.po >/dev/null
- cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo >/dev/null
- cmp $sourcedir/foo-bar-fr.pobak $sourcedir/foo-bar-fr.po >/dev/null
- cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo >/dev/null
- cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po >/dev/null
- cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo >/dev/null
+ cmp $sourcedir/foo-bar-de.pobak $sourcedir/foo-bar-de.po
+ cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo
+ cmp $sourcedir/foo-bar-fr.pobak $sourcedir/foo-bar-fr.po
+ cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo
+ cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po
+ cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo
# Check that "make install" updates the POT file, the PO files, and the
# MO files listed in the _LINGUAS variable, regardless whether LINGUAS
# was specified or not.
- make install
- cat $sourcedir/foo-bar.pot | grep great >/dev/null
- cat $sourcedir/foo-bar-de.po | grep great >/dev/null
- if cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo >/dev/null;
then
- exit 1
- fi
- cat $sourcedir/foo-bar-fr.po | grep great >/dev/null
- if cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo >/dev/null;
then
- exit 1
- fi
- cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po >/dev/null
- cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo >/dev/null
-
- # Check that "make dist" updates the POT file, the PO files, and the
+ $MAKE install
+ grep great $sourcedir/foo-bar.pot
+ # NOTE: This is *not* a useless use of cat. The *.po files can contain
+ # non-ASCII characters, which might cause problems with some `grep'
+ # programs. BSD `grep' works from a pipe, but not a seekable file.
+ # GNU or BSD `grep -a' works on files, but is not portable.
+ cat $sourcedir/foo-bar-de.po | grep great
+ cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo && Exit 1
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/foo-bar-fr.po | grep great
+ cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo && Exit 1
+ cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po
+ cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo
+
+ # Check that "make distdir" updates the POT file, the PO files, and the
# MO files listed in the _LINGUAS variable, regardless whether LINGUAS
# was specified or not.
cp -p $sourcedir/foo-bar.potbak $sourcedir/foo-bar.pot
@@ -254,30 +251,31 @@ END
cp -p $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo
cp -p $sourcedir/foo-bar-fr.pobak $sourcedir/foo-bar-fr.po
cp -p $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo
- make dist
- cat $sourcedir/foo-bar.pot | grep great >/dev/null
- cat $sourcedir/foo-bar-de.po | grep great >/dev/null
- if cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo >/dev/null;
then
- exit 1
- fi
- cat $sourcedir/foo-bar-fr.po | grep great >/dev/null
- if cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo >/dev/null;
then
- exit 1
- fi
- cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po >/dev/null
- cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo >/dev/null
+ $MAKE distdir
+ grep great $sourcedir/foo-bar.pot
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/foo-bar-de.po | grep great
+ cmp $sourcedir/foo-bar-de.mobak $sourcedir/foo-bar-de.mo && Exit 1
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/foo-bar-fr.po | grep great
+ cmp $sourcedir/foo-bar-fr.mobak $sourcedir/foo-bar-fr.mo && Exit 1
+ cmp $sourcedir/foo-bar-es.pobak $sourcedir/foo-bar-es.po
+ cmp $sourcedir/foo-bar-es.mobak $sourcedir/foo-bar-es.mo
# Check that the updated PO files contain 'previous msgid' fields.
- cat $sourcedir/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
- cat $sourcedir/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
>/dev/null
+ # NOTE: This is *not* a useless use of cat. See comments above.
+ cat $sourcedir/foo-bar-de.po | grep '^#| msgid "Hello, world\.\\n"$'
+ cat $sourcedir/foo-bar-fr.po | grep '^#| msgid "Hello, world\.\\n"$'
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- rm -f $sourcedir/foo-bar.potbak $sourcedir/*.pobak $sourcedir/*.mobak
- make distclean
+ rm -f $sourcedir/foo-bar.potbak $sourcedir/*.[mp]obak
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
done
+
+:
diff --git a/tests/pot-warn1.test b/tests/pot-warn1.test
old mode 100644
new mode 100755
index 2c79fb6..d69f3f3
--- a/tests/pot-warn1.test
+++ b/tests/pot-warn1.test
@@ -47,5 +47,6 @@ posub_foo_bar_pot_SOURCES =
END
# Check that there is no warning any more.
+$AUTOMAKE -Werror
-AUTOMAKE_run 0 -Werror
+:
diff --git a/tests/pot-warn2.test b/tests/pot-warn2.test
old mode 100644
new mode 100755
index 605655a..724930b
--- a/tests/pot-warn2.test
+++ b/tests/pot-warn2.test
@@ -46,4 +46,6 @@ END
# Check that there is no warning any more.
-AUTOMAKE_run 0 -Werror
+$AUTOMAKE -Werror
+
+:
diff --git a/tests/pot-xgettext1.test b/tests/pot-xgettext1.test
old mode 100644
new mode 100755
index d6cffcc..c906fb9
--- a/tests/pot-xgettext1.test
+++ b/tests/pot-xgettext1.test
@@ -82,25 +82,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-xgettext2.test b/tests/pot-xgettext2.test
old mode 100644
new mode 100755
index 0c6e326..4bc2488
--- a/tests/pot-xgettext2.test
+++ b/tests/pot-xgettext2.test
@@ -82,25 +82,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-xgettext3.test b/tests/pot-xgettext3.test
old mode 100644
new mode 100755
index 285646f..22213b7
--- a/tests/pot-xgettext3.test
+++ b/tests/pot-xgettext3.test
@@ -97,25 +97,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/posub/foo-bar.pot
- test $builddir = '.' || test ! -f posub/foo-bar.pot
- cat $sourcedir/posub/foo-bar.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr
-d '\r' > actual
+ test $builddir = '.' || test ! -r posub/foo-bar.pot
+ grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d
'\r' > actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
diff --git a/tests/pot-xgettext4.test b/tests/pot-xgettext4.test
old mode 100644
new mode 100755
index a170525..539e143
--- a/tests/pot-xgettext4.test
+++ b/tests/pot-xgettext4.test
@@ -92,25 +92,27 @@ for builddir in . sub; do
instdir="`pwd`/instdir"
cd $builddir
$sourcedir/configure --prefix="$instdir"
- make
+ $MAKE
- # Check that "make dist" creates the expected .pot file.
+ # Check that "make distdir" creates the expected .pot file.
# (It is created under $sourcedir, because the .pot file is distributed.
# Cf. the GNU standards, node "Makefile Basics".)
- make dist
+ $MAKE distdir
test -f $sourcedir/maude.pot
- test $builddir = '.' || test ! -f maude.pot
- cat $sourcedir/maude.pot | grep -v 'POT-Creation-Date' | LC_ALL=C tr -d '\r'
> actual
+ test $builddir = '.' || test ! -r maude.pot
+ grep -v 'POT-Creation-Date' $sourcedir/maude.pot | LC_ALL=C tr -d '\r' >
actual
diff actual $sourcedir/expected
rm -f actual
# Sanity check.
- make distcheck
+ $MAKE distcheck
# Clean up.
- make distclean
+ $MAKE distclean
rm -rf "$instdir"
cd $sourcedir
done
+
+:
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, pot-primary, updated. v1.11-340-g41f0c9f,
Stefano Lattarini <=