From: Neil Horman <nhorman@openssl.org>
Date: Thu, 29 Aug 2024 20:54:19 +0000 (-0400)
Subject: Collapse errors down by using || in run_endpoint.sh
X-Git-Tag: openssl-3.5.0-alpha1~1146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2157bbb836af8e11d1a4290407e66b315374ac1;p=thirdparty%2Fopenssl.git

Collapse errors down by using || in run_endpoint.sh

Makes for smaller more consistent coding

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/25256)
---

diff --git a/test/quic-openssl-docker/run_endpoint.sh b/test/quic-openssl-docker/run_endpoint.sh
index 9a6b5f9b7ac..cccebd370bb 100644
--- a/test/quic-openssl-docker/run_endpoint.sh
+++ b/test/quic-openssl-docker/run_endpoint.sh
@@ -36,43 +36,27 @@ if [ "$ROLE" == "client" ]; then
 
     case "$TESTCASE" in
     "http3"|"transfer")
-    echo -e "--verbose\n--parallel" >> $CURLRC
-    generate_outputs_http3
-    dump_curlrc
-        SSL_CERT_FILE=/certs/ca.pem curl --config $CURLRC 
-        if [ $? -ne 0 ]
-        then
-            exit 1
-        fi
+        echo -e "--verbose\n--parallel" >> $CURLRC
+        generate_outputs_http3
+        dump_curlrc
+        SSL_CERT_FILE=/certs/ca.pem curl --config $CURLRC || exit 1
         exit 0
         ;;
     "handshake")
        OUTFILE=$(basename $REQUESTS)
        echo -e "--verbose\n--http3\n-H \"Connection: close\"\n-o /downloads/$OUTFILE\n--url $REQUESTS" >> $CURLRC
        dump_curlrc
-       SSL_CERT_FILE=/certs/ca.pem curl --config $CURLRC 
-       if [ $? -ne 0 ]
-       then
-           exit 1
-       fi
+       SSL_CERT_FILE=/certs/ca.pem curl --config $CURLRC || exit 1
        exit 0
        ;; 
     "retry")
        OUTFILE=$(basename $REQUESTS)
-       SSL_CERT_FILE=/certs/ca.pem curl --verbose --http3 -o /downloads/$OUTFILE $REQUESTS
-       if [ $? -ne 0 ]
-       then
-           exit 1
-       fi
+       SSL_CERT_FILE=/certs/ca.pem curl --verbose --http3 -o /downloads/$OUTFILE $REQUESTS || exit 1
        exit 0
        ;; 
     "chacha20")
        OUTFILE=$(basename $REQUESTS)
-       SSL_CERT_FILE=/certs/ca.pem curl --verbose --tlsv1.3 --tls13-ciphers TLS_CHACHA20_POLY1305_SHA256 --http3 -o /downloads/$OUTFILE $REQUESTS
-       if [ $? -ne 0 ]
-       then
-           exit 1
-       fi
+       SSL_CERT_FILE=/certs/ca.pem curl --verbose --tlsv1.3 --tls13-ciphers TLS_CHACHA20_POLY1305_SHA256 --http3 -o /downloads/$OUTFILE $REQUESTS || exit 1
        exit 0
        ;; 
     *)