diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-10 10:06:17 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-10 10:06:17 -0400 |
| commit | 30f54ad295d58ff8c6d28c1fd612d23c2c343d19 (patch) | |
| tree | f740e39be9698b13d0f0a088903b236988aeb075 /test/tpkcs7d | |
| parent | 2cfdfe0918f03f8323c9523a2beb2b363ae86ca7 (diff) | |
test script cleanup
Removed commented-out tests
Standardize on doing
cmd ... || exit 1
instead of
cmd ...
if [ $? != 0] ; then
exit 1
fi
where that if statement has ben one, three, or four lines, variously.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test/tpkcs7d')
| -rw-r--r-- | test/tpkcs7d | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/test/tpkcs7d b/test/tpkcs7d index 4354d59c80..9dc2932a38 100644 --- a/test/tpkcs7d +++ b/test/tpkcs7d @@ -13,30 +13,22 @@ echo "testing pkcs7 conversions (2)" cp $t p7d-fff.p echo "p -> d" -$cmd -in p7d-fff.p -inform p -outform d >p7d-f.d -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-fff.p -inform p -outform d >p7d-f.d || exit 1 echo "p -> p" -$cmd -in p7d-fff.p -inform p -outform p >p7d-f.p -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-fff.p -inform p -outform p >p7d-f.p || exit 1 echo "d -> d" -$cmd -in p7d-f.d -inform d -outform d >p7d-ff.d1 -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-f.d -inform d -outform d >p7d-ff.d1 || exit 1 echo "p -> d" -$cmd -in p7d-f.p -inform p -outform d >p7d-ff.d3 -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-f.p -inform p -outform d >p7d-ff.d3 || exit 1 echo "d -> p" -$cmd -in p7d-f.d -inform d -outform p >p7d-ff.p1 -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-f.d -inform d -outform p >p7d-ff.p1 || exit 1 echo "p -> p" -$cmd -in p7d-f.p -inform p -outform p >p7d-ff.p3 -if [ $? != 0 ]; then exit 1; fi +$cmd -in p7d-f.p -inform p -outform p >p7d-ff.p3 || exit 1 -cmp p7d-f.p p7d-ff.p1 -if [ $? != 0 ]; then exit 1; fi -cmp p7d-f.p p7d-ff.p3 -if [ $? != 0 ]; then exit 1; fi +cmp p7d-f.p p7d-ff.p1 || exit 1 +cmp p7d-f.p p7d-ff.p3 || exit 1 /bin/rm -f p7d-f.* p7d-ff.* p7d-fff.* exit 0 |