diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-01-31 20:30:06 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-01-31 20:30:06 +0100 |
| commit | c9a64eae05818161f2a92cc9e2e76de3045a1ce5 (patch) | |
| tree | afbb36d579f96c0d85d42afb8dc1569663aa666a /tests | |
| parent | 14406d26fa1119a20dc48dc54a739f65c35dea28 (diff) | |
| download | gnutls-c9a64eae05818161f2a92cc9e2e76de3045a1ce5.tar.gz | |
better output in chain output.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/x509paths/chain | 16 |
1 files changed, 8 insertions, 8 deletions
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. " |