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>

1 files changed, 25 insertions, 51 deletions

diff --git a/test/tkey b/test/tkey
index b7097e6f6f..c6abd2f3ea 100644
--- a/test/tkey
+++ b/test/tkey
@@ -20,81 +20,55 @@ echo testing $ktype $ptype conversions
 cp $t $ktype-fff.p
 
 echo "p -> d"
-$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d || exit 1
 echo "p -> p"
-$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p || exit 1
 
 echo "d -> d"
-$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1 || exit 1
 echo "p -> d"
-$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3 || exit 1
 
 echo "d -> p"
-$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1 || exit 1
 echo "p -> p"
-$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3 || exit 1
 
-cmp $ktype-fff.p $ktype-f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-fff.p $ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-fff.p $ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp $ktype-f.p $ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-f.p $ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
+cmp $ktype-fff.p $ktype-f.p || exit 1
+cmp $ktype-fff.p $ktype-ff.p1 || exit 1
+cmp $ktype-fff.p $ktype-ff.p3 || exit 1
+cmp $ktype-f.p $ktype-ff.p1 || exit 1
+cmp $ktype-f.p $ktype-ff.p3 || exit 1
 
 /bin/rm -f $ktype-f.* $ktype-ff.* $ktype-fff.*
 
-if [ $ptype = "public" ]; then
-    exit 0
-fi
+[ $ptype = "public" ] && exit 0
 
-cmd="../util/shlib_wrap.sh ../apps/openssl pkey"
 
 echo testing $ktype PKCS#8 conversions
+cmd="../util/shlib_wrap.sh ../apps/openssl pkey"
 
 $cmd -in $t -out $ktype-fff.p
 
 echo "p -> d"
-$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-fff.p -inform p -outform d >$ktype-f.d || exit 1
 echo "p -> p"
-$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-fff.p -inform p -outform p >$ktype-f.p || exit 1
 
 echo "d -> d"
-$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.d -inform d -outform d >$ktype-ff.d1 || exit 1
 echo "p -> d"
-$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.p -inform p -outform d >$ktype-ff.d3 || exit 1
 
 echo "d -> p"
-$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.d -inform d -outform p >$ktype-ff.p1 || exit 1
 echo "p -> p"
-$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp $ktype-fff.p $ktype-f.p
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-fff.p $ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-fff.p $ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
-
-cmp $ktype-f.p $ktype-ff.p1
-if [ $? != 0 ]; then exit 1; fi
-cmp $ktype-f.p $ktype-ff.p3
-if [ $? != 0 ]; then exit 1; fi
+$cmd -in $ktype-f.p -inform p -outform p >$ktype-ff.p3 || exit 1
+
+cmp $ktype-fff.p $ktype-f.p || exit 1
+cmp $ktype-fff.p $ktype-ff.p1 || exit 1
+cmp $ktype-fff.p $ktype-ff.p3 || exit 1
+cmp $ktype-f.p $ktype-ff.p1 || exit 1
+cmp $ktype-f.p $ktype-ff.p3 || exit 1
 
 /bin/rm -f $ktype-f.* $ktype-ff.* $ktype-fff.*