maint.mk: prohibit use of test's -o and -a operators

* top/maint.mk (sc_prohibit_test_minus_ao): New rule.

diff --git a/ChangeLog b/ChangeLog
index 259a8118465cff674ae20fda5be993f156d7321f..12e072206a065b8280218c56f76283a8bbbec332 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-26  Jim Meyering  <meyering@redhat.com>
+           Eric Blake  <eblake@redhat.com>
+
+       maint.mk: prohibit use of test's -o and -a operators
+       * top/maint.mk (sc_prohibit_test_minus_ao): New rule.
+
 2010-03-28  Bruno Haible  <bruno@clisp.org>
 
        Remove unused GNULIB_XYZ macro definitions.

diff --git a/top/maint.mk b/top/maint.mk
index 6127c572f36f07da03da81f45e5ffb068de8ae98..d63318858fbbd43656eecb2c63fda58148808ec8 100644 (file)
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -593,6 +593,14 @@ sc_prohibit_S_IS_definition:
        msg='do not define S_IS* macros; include <sys/stat.h>'          \
          $(_prohibit_regexp)
 
+_ptm1 = use "test C1 && test C2", not "test C1 -''a C2"
+_ptm2 = use "test C1 || test C2", not "test C1 -''o C2"
+# Using test's -a and -o operators is not portable.
+sc_prohibit_test_minus_ao:
+       @re='\<test .+ -[ao] '                                          \
+       msg='$(_ptm1); $(_ptm2)'                                                \
+         $(_prohibit_regexp)
+
 # Each program that uses proper_name_utf8 must link with one of the
 # ICONV libraries.  Otherwise, some ICONV library must appear in LDADD.
 # The perl -0777 invocation below extracts the possibly-multi-line