diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-06-05 21:09:46 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-06-05 21:09:46 +0200 |
| commit | cf20fa0f09c6ba7737b41d6e64764e2f8a607839 (patch) | |
| tree | e3fe481c9906fe59abc0c7c5c508ece4257cb001 /tests/openpgp-certs | |
| parent | c66f5d4daa8bd81b662486b76a022db118869b5e (diff) | |
| download | gnutls-cf20fa0f09c6ba7737b41d6e64764e2f8a607839.tar.gz | |
Corrected fail() shell function. Reported by Andreas Metzler.
Diffstat (limited to 'tests/openpgp-certs')
| -rwxr-xr-x | tests/openpgp-certs/testcerts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/openpgp-certs/testcerts b/tests/openpgp-certs/testcerts index f9dbf23b5d..3ae5065e1a 100755 --- a/tests/openpgp-certs/testcerts +++ b/tests/openpgp-certs/testcerts @@ -47,10 +47,10 @@ wait_server $PID # fail "Connection to verified IP address should have succeeded! (error code $?)" $? $CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null 2>&1 && \ - fail "Connection to unrecognized IP address should have failed!" + fail $PID "Connection to unrecognized IP address should have failed!" $CLI $DEBUG -p $PORT localhost --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null 2>&1 && \ - fail "Connection to unverified (but present) 'localhost' should have failed!" + fail $PID "Connection to unverified (but present) 'localhost' should have failed!" kill $PID wait @@ -59,14 +59,14 @@ launch_server $$ --pgpcertfile $srcdir/srv-public-localhost-signed.gpg --pgpkeyf wait_server $PID echo | $CLI $DEBUG -p $PORT 127.0.0.1 --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null 2>&1 && \ - fail "Connection to unverified IP address should have failed! (error code $?)" $? + fail $PID "Connection to unverified IP address should have failed! (error code $?)" $? $CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null 2>&1 && \ - fail "Connection to unrecognized IP address should have failed!" + fail $PID "Connection to unrecognized IP address should have failed!" #see reason above #$CLI -p $PORT localhost --pgpkeyring ca-public.gpg </dev/null >/dev/null || \ -# fail "Connection to verified 'localhost' should have succeded! (error code $?)" $? +# fail $PID "Connection to verified 'localhost' should have succeded! (error code $?)" $? kill $PID wait @@ -76,10 +76,10 @@ wait_server $PID # give the server a chance to initialize echo | $CLI $DEBUG -p $PORT 127.0.0.1 --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null || \ - fail "Connection to signed PGP certificate should have succeeded! (error code $?)" $? + fail $PID "Connection to signed PGP certificate should have succeeded! (error code $?)" $? $CLI $DEBUG -p $PORT 127.0.0.2 --pgpkeyring $srcdir/ca-public.gpg </dev/null >/dev/null && \ - fail "Connection to unrecognized IP address should have failed!" + fail $PID "Connection to unrecognized IP address should have failed!" kill $PID wait |