From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 31 Jan 2011 19:30:06 +0000 (+0100)
Subject: better output in chain output.
X-Git-Tag: gnutls_2_11_7~80
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c9a64eae05818161f2a92cc9e2e76de3045a1ce5;p=thirdparty%2Fgnutls.git

better output in chain output.
---

diff --git a/tests/x509paths/chain b/tests/x509paths/chain
index 060c30a154..f581fecd43 100755
--- a/tests/x509paths/chain
+++ b/tests/x509paths/chain
@@ -30,25 +30,25 @@ test -d X509tests || tar xfz x509tests.tgz
 
 i=1
 while test -d X509tests/test$i; do
-    find X509tests/test$i -name *.crl -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --crl-info --inder --infile > chain$i.pem
-    find X509tests/test$i -name E*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem
+    find X509tests/test$i -name *.crl -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --crl-info --inder --infile > chain$i.pem  2>/dev/null
+    find X509tests/test$i -name E*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem 2>/dev/null
     if test "$i" -gt 1; then
-	find X509tests/test$i -name I*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem
+	find X509tests/test$i -name I*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem 2>/dev/null
     fi
-    find X509tests/test$i -name T*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem
+    find X509tests/test$i -name T*.crt -print0 |sort -r -z|xargs -n1 --null $CERTTOOL --certificate-info --inder --infile >> chain$i.pem 2>/dev/null
     $CERTTOOL -e --infile chain$i.pem > out 2>&1
     rc=$?
     if test $rc != 0; then
 	echo "Chain $i FATAL failure."
     else
-	if echo "$SUCCESS" | grep " $i " > /dev/null; then
-	    if grep 'Verification output:' out | grep -v 'Verification output: Verified\.$' > /dev/null; then
+	if echo "$SUCCESS" | grep " $i " > /dev/null 2>&1; then
+	    if grep 'Chain verification output:' out | grep -v 'Chain verification output: Verified\.$' > /dev/null 2>&1; then
 		echo "Chain $i verification failure UNEXPECTED."
 	    else
 		echo "Chain $i verification success as expected."
 	    fi
-	elif echo "$FAILURE" | grep " $i "; then
-	    if grep 'Verification output:' out | grep -v 'Verification output: Verified\.$' > /dev/null; then
+	elif echo "$FAILURE" | grep " $i " >/dev/null 2>&1; then
+	    if grep 'Chain verification output:' out | grep -v 'Chain verification output: Verified\.$' > /dev/null 2>&1; then
 		echo "Chain $i verification failure as expected."
 	    else
 		echo "Chain $i verification success UNEXPECTED. "