From 271945a148395230066a61b426437b99ca39091b Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Fri, 26 Mar 2010 08:41:05 +0100
Subject: [PATCH] maint: update syntax-check rule to also catch test's -o
 operator

* cfg.mk (sc_prohibit_test_minus_a): Rename...
(sc_prohibit_test_minus_ao): ...and flag '-o', too.
---
 cfg.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/cfg.mk b/cfg.mk
index bf5eae3093..7fdb069eb8 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -270,10 +270,12 @@ sc_preprocessor_indentation:
 	  echo '$(ME): skipping test $@: cppi not installed' 1>&2;	\
 	fi
 
-# Using test's -a operator is not portable.
-sc_prohibit_test_minus_a:
-	@re='\<test .+ -[a] '						\
-	msg='use "test C1 && test C2, not "test C1 -''a C2"'		\
+_m1 = use "test C1 && test C2", not "test C1 -''a C2"
+_m2 = 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='$(_m1); $(_m2)'						\
 	  $(_prohibit_regexp)
 
 sc_copyright_format: