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.

diff --git a/ChangeLog b/ChangeLog
index fbead47b79f9a8bf4a2ce5f982d731b53b7155cb..3872db4a2c1ee4c6891becbba2df86f9f89b4871 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,28 @@
 2010-09-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       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

diff --git a/tests/pot-copyright.test b/tests/pot-copyright.test
index fb11367d61cc565ad6e1db2a17a5833564e423cd..68c6b3319d0c295af6a94f390f648686ee46098a 100755 (executable)
--- a/tests/pot-copyright.test
+++ b/tests/pot-copyright.test
@@ -91,7 +91,7 @@ for builddir in . sub; do
   $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

diff --git a/tests/pot-empty.test b/tests/pot-empty.test
index 46611aa201bcf3fe7f90574edc1f42f423a8377b..657753ef78dc2e28065241a116a1479d5cc540dc 100755 (executable)
--- a/tests/pot-empty.test
+++ b/tests/pot-empty.test
@@ -61,12 +61,12 @@ for builddir in . sub; do
   $MAKE dist
 
   # Check that no .pot file was created.
-  test ! -f posub/foo-bar.pot
+  test ! -r posub/foo-bar.pot
 
   $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

diff --git a/tests/pot-format-csharp1.test b/tests/pot-format-csharp1.test
index 7e85c4d18d650d2099f863ec95010c7479b126d5..342a2e58c12614f9d9c3e3cd6645cf8b72657326 100755 (executable)
--- a/tests/pot-format-csharp1.test
+++ b/tests/pot-format-csharp1.test
@@ -136,37 +136,37 @@ for builddir in . sub; do
     $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
     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/foo-bar-fr_CA@latin.po
-    test ! -f $sourcedir/posub/foo-bar-fr_CA@latin.resources.dll
+    test ! -r $sourcedir/posub/foo-bar-fr_CA@latin.resources.dll
     test -f $sourcedir/posub/fr-CA-Latn/foo-bar.resources.dll
-    test ! -f $sourcedir/posub/foo-bar-de.mo
-    test ! -f $sourcedir/posub/foo-bar-fr_CA@latin.mo
+    test ! -r $sourcedir/posub/foo-bar-de.mo
+    test ! -r $sourcedir/posub/foo-bar-fr_CA@latin.mo
 
     if test -z "$config_options"; then
       # Check that "make install" installed de,po and fr_CA@latin.po 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 fr_CA@latin.po 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/fr_CA@latin/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/fr_CA@latin/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/fr_CA@latin/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/fr_CA@latin/LC_MESSAGES/foo-bar.mo
+    test ! -r "$instdir"/share/locale/es/LC_MESSAGES/foo-bar.mo
 
     # Check that "make distdir" creates the expected .pot file.
 
@@ -175,19 +175,19 @@ for builddir in . sub; do
     $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
     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/foo-bar-fr_CA@latin.po
-    test ! -f $sourcedir/posub/foo-bar-fr_CA@latin.resources.dll
+    test ! -r $sourcedir/posub/foo-bar-fr_CA@latin.resources.dll
     test -f $sourcedir/posub/fr-CA-Latn/foo-bar.resources.dll
-    test ! -f $sourcedir/posub/foo-bar-de.mo
-    test ! -f $sourcedir/posub/foo-bar-fr_CA@latin.mo
+    test ! -r $sourcedir/posub/foo-bar-de.mo
+    test ! -r $sourcedir/posub/foo-bar-fr_CA@latin.mo
 
     # Check that the tarball contains posub/foo-bar-{de,fr}.{po,resources.dll}
     # but not the others, regardless whether LINGUAS was specified or not.

diff --git a/tests/pot-format-java1.test b/tests/pot-format-java1.test
index c5fdfd48fb697e37f2072560ec2d3a93279bc9a0..5316893e930a1f1bcfa52107050911c03852c536 100755 (executable)
--- a/tests/pot-format-java1.test
+++ b/tests/pot-format-java1.test
@@ -137,37 +137,37 @@ for builddir in . sub; do
     $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
     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 distdir" creates the expected .pot file.
 
@@ -176,19 +176,19 @@ for builddir in . sub; do
     $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
     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.

diff --git a/tests/pot-format-java2.test b/tests/pot-format-java2.test
index 644bc47fb5120bd6e4435e221f3fa41ec0612ff8..59525328f66e95afc8b3a9c868c6a0f520848bbe 100755 (executable)
--- a/tests/pot-format-java2.test
+++ b/tests/pot-format-java2.test
@@ -137,37 +137,37 @@ for builddir in . sub; do
     $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
     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 distdir" creates the expected .pot file.
 
@@ -176,19 +176,19 @@ for builddir in . sub; do
     $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
     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.

diff --git a/tests/pot-format-qt1.test b/tests/pot-format-qt1.test
index c88f6cd7fe40b9bf9501a18fc158736075155b46..6df1af28972f862be9313897d3a37e1643a31659 100755 (executable)
--- a/tests/pot-format-qt1.test
+++ b/tests/pot-format-qt1.test
@@ -162,7 +162,7 @@ for builddir in . sub; do
     $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
     grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
     diff actual $sourcedir/expected
     rm -f actual
@@ -171,26 +171,26 @@ 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 distdir" creates the expected .pot file.
 
@@ -199,7 +199,7 @@ for builddir in . sub; do
     $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
     grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
     diff actual $sourcedir/expected
     rm -f actual
@@ -208,8 +208,8 @@ 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.

diff --git a/tests/pot-format-tcl1.test b/tests/pot-format-tcl1.test
index ab3d5ae9d2098020b7d59918872a7bc2e696c7a9..6f9f4d3bc73f75dad946883523d60f1fdccaee52 100755 (executable)
--- a/tests/pot-format-tcl1.test
+++ b/tests/pot-format-tcl1.test
@@ -132,37 +132,37 @@ for builddir in . sub; do
     $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
     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 distdir" creates the expected .pot file.
 
@@ -171,19 +171,19 @@ for builddir in . sub; do
     $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
     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.

diff --git a/tests/pot-linguas.test b/tests/pot-linguas.test
index 7557b876b613f940a0244a7d15a4bfb7044346ab..1df57fb5adc3740f7a9fb8d6fb0d5bb4deae6468 100755 (executable)
--- a/tests/pot-linguas.test
+++ b/tests/pot-linguas.test
@@ -152,7 +152,7 @@ END
     $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
     grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
     diff actual $sourcedir/expected
     rm -f actual
@@ -166,12 +166,12 @@ 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 distdir" creates the expected .pot file.
@@ -181,7 +181,7 @@ END
     $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
     grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
     diff actual $sourcedir/expected
     rm -f actual

diff --git a/tests/pot-msgidbugs.test b/tests/pot-msgidbugs.test
index aba3df28c5b422f80d7643c08a8bcfa38f64ddd5..36811e90a153965ae9d5fce10795241c329a4ad8 100755 (executable)
--- a/tests/pot-msgidbugs.test
+++ b/tests/pot-msgidbugs.test
@@ -94,7 +94,7 @@ for builddir in . sub1; do
   $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
@@ -157,7 +157,7 @@ for builddir in . sub2; do
   $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
   grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
   diff actual $sourcedir/expected
   rm -f actual

diff --git a/tests/pot-no-linguas.test b/tests/pot-no-linguas.test
index 4f34264ee4b58bf96308a619592082a7e055ccfa..d604c9eb0808deee8eb2b313fb701bffa8f578cb 100755 (executable)
--- a/tests/pot-no-linguas.test
+++ b/tests/pot-no-linguas.test
@@ -120,7 +120,7 @@ END
   $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
   grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
   diff actual $sourcedir/expected
   rm -f actual
@@ -132,14 +132,14 @@ END
   $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
   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'

diff --git a/tests/pot-noinst.test b/tests/pot-noinst.test
index 37735838823799f67b88314b8f4a39ed09ae2803..6688c6c8766c72ee295f11007b4f0a1174601f50 100755 (executable)
--- a/tests/pot-noinst.test
+++ b/tests/pot-noinst.test
@@ -146,14 +146,14 @@ END
 
     $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 distdir" creates the expected .pot file, .po files
     # and .mo files.
@@ -163,7 +163,7 @@ END
     $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
     grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
     diff actual $sourcedir/expected
     rm -f actual

diff --git a/tests/pot-override1.test b/tests/pot-override1.test
index e2e4a77d305fa2f93f9559a0d159efa1f5133f73..80dde7f9e603e7941857f636c4b846ae6721e17c 100755 (executable)
--- a/tests/pot-override1.test
+++ b/tests/pot-override1.test
@@ -97,7 +97,7 @@ END
   $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
@@ -107,7 +107,7 @@ END
   $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.

diff --git a/tests/pot-samedir.test b/tests/pot-samedir.test
index ccdd41d18ed01803720530482bb839f218eafeda..424e58288ca18141722b7ce14bd9d86481231a17 100755 (executable)
--- a/tests/pot-samedir.test
+++ b/tests/pot-samedir.test
@@ -168,13 +168,13 @@ for builddir in . sub; do
   $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
   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
+  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
@@ -188,10 +188,10 @@ 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.
   cmp "$instdir"/share/locale/de/LC_MESSAGES/foo-bar.mo \
       "$instdir"/share/locale/de/LC_MESSAGES/foo-baz.mo && Exit 1

diff --git a/tests/pot-topsrcdir.test b/tests/pot-topsrcdir.test
index 23ebe67bf38dbf7402acf581db83404408453b2d..4e55c6bd1acbb979f7a383cd432c695ac4d5601c 100755 (executable)
--- a/tests/pot-topsrcdir.test
+++ b/tests/pot-topsrcdir.test
@@ -149,7 +149,7 @@ END
     $MAKE install
 
     test -f $sourcedir/foo-bar.pot
-    test $builddir = '.' || test ! -f foo-bar.pot
+    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
@@ -163,12 +163,12 @@ 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 distdir" creates the expected .pot file.
@@ -178,7 +178,7 @@ END
     $MAKE distdir
 
     test -f $sourcedir/foo-bar.pot
-    test $builddir = '.' || test ! -f foo-bar.pot
+    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

diff --git a/tests/pot-xgettext1.test b/tests/pot-xgettext1.test
index d018fa74954c609926d1224cc97b333fe3375d50..c906fb9b637c0f213b296d0bed1557abfc1f8836 100755 (executable)
--- a/tests/pot-xgettext1.test
+++ b/tests/pot-xgettext1.test
@@ -91,7 +91,7 @@ for builddir in . sub; do
   $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
   grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
   diff actual $sourcedir/expected
   rm -f actual

diff --git a/tests/pot-xgettext2.test b/tests/pot-xgettext2.test
index 0bd2407c753ebc797963d7e40276cb7fc047ca5b..4bc2488ce74dbf2e04d4301fab26bc36be4f8d83 100755 (executable)
--- a/tests/pot-xgettext2.test
+++ b/tests/pot-xgettext2.test
@@ -91,7 +91,7 @@ for builddir in . sub; do
   $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
   grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
   diff actual $sourcedir/expected
   rm -f actual

diff --git a/tests/pot-xgettext3.test b/tests/pot-xgettext3.test
index ef5ad8bf095824f20916b2efee562706406e8744..22213b7f60ff50da897b28a761f7bfb9536c2d3b 100755 (executable)
--- a/tests/pot-xgettext3.test
+++ b/tests/pot-xgettext3.test
@@ -106,7 +106,7 @@ for builddir in . sub; do
   $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
   grep -v 'POT-Creation-Date' $sourcedir/posub/foo-bar.pot | LC_ALL=C tr -d '\r' > actual
   diff actual $sourcedir/expected
   rm -f actual

diff --git a/tests/pot-xgettext4.test b/tests/pot-xgettext4.test
index 61b59de59a6d5ef786f50784bf0ef730b5c181bd..539e143e7521a8b654ae415472b70ad139368a2c 100755 (executable)
--- a/tests/pot-xgettext4.test
+++ b/tests/pot-xgettext4.test
@@ -101,7 +101,7 @@ for builddir in . sub; do
   $MAKE distdir
 
   test -f $sourcedir/maude.pot
-  test $builddir = '.' || test ! -f maude.pot
+  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