Fix syntax-check nits.

diff --git a/cfg.mk b/cfg.mk
index 17098d4fc1c2467b1eb93041d7b0a2cb53f00931..76ab6691d832f8fbba23503a12aafeb8627c40eb 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,7 +40,7 @@ local-checks-to-skip = sc_GPL_version sc_bindtextdomain                       \
        sc_require_config_h_first sc_texinfo_acronym sc_trailing_blank  \
        sc_unmarked_diagnostics sc_useless_cpp_parens
 
-VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|(build-aux/|gl/|src/cfg/|tests/suite/ecore/|doc/protocol/).*$$
+VC_LIST_ALWAYS_EXCLUDE_REGEX = ^maint.mk|(devel/perlasm/|build-aux/|gl/|src/cfg/|tests/suite/ecore/|doc/protocol/).*$$
 
 # Explicit syntax-check exceptions.
 exclude_file_name_regexp--sc_cast_of_alloca_return_value = ^guile/modules/gnutls/build/priorities.scm|guile/src/core.c$$
@@ -50,7 +50,7 @@ exclude_file_name_regexp--sc_file_system = ^doc/doxygen/Doxyfile
 exclude_file_name_regexp--sc_prohibit_cvs_keyword = ^lib/nettle/.*$$
 exclude_file_name_regexp--sc_prohibit_undesirable_word_seq = ^tests/nist-pkits/gnutls-nist-tests.html$$
 exclude_file_name_regexp--sc_space_tab = ^gtk-doc.make|doc/.*.(pdf|png)|tests/nist-pkits/|tests/suite/x509paths/.*$$
-exclude_file_name_regexp--sc_two_space_separator_in_usage = ^doc/cha-programs.texi|tests/sha2/sha2|tests/sha2/sha2-dsa$$
+exclude_file_name_regexp--sc_two_space_separator_in_usage = ^doc/cha-programs.texi|doc/cha-cert-auth2.texi|tests/sha2/sha2|tests/sha2/sha2-dsa|tests/ecdsa/ecdsa
 
 autoreconf:
        for f in $(PODIR)/*.po.in; do \

diff --git a/tests/suite/chain b/tests/suite/chain
index 99b62e57278854fcf3aaaa092952795e1036cf75..26a53ba8b44f103162e7d014a4e824936c0af0b5 100755 (executable)
--- a/tests/suite/chain
+++ b/tests/suite/chain
@@ -1,7 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2007, 2009, 2010 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2011 Free Software Foundation, Inc.
 #
 # Author: Simon Josefsson
 #
@@ -43,7 +42,7 @@ while test -d X509tests/test$i; do
     find X509tests/test$i -name T*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chains/chain$i.pem 2>/dev/null
     $CERTTOOL -e --infile chains/chain$i.pem > out 2>&1
     rc=$?
-    if test $rc != 0 -a $rc != 1; then
+    if test $rc != 0 && test $rc != 1; then
        echo "Chain $i FATAL failure."
        RET=1
     else