remove --tls argument from perf script

aws · Jun 3, 2022 · 1448daa · 1448daa
1 parent f7163ca
commit 1448daa
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/qns.yml b/.github/workflows/qns.yml
@@ -583,7 +583,6 @@ jobs:
     needs: [quinn, s2n-quic-qns]
     strategy:
       matrix:
-        tls: ["s2n-tls", "rustls"]
         include:
           - client: "quinn"
             server: "s2n-quic"

diff --git a/quic/s2n-quic-qns/etc/run_endpoint.sh b/quic/s2n-quic-qns/etc/run_endpoint.sh
@@ -52,8 +52,10 @@ if [ "$QNS_MODE" == "interop" ]; then
     fi
 fi
 
-SERVER_PARAMS+=" --tls $TLS"
-CLIENT_PARAMS+=" --tls $TLS"
+if [ "$QNS_MODE" == "interop" ]; then
+    SERVER_PARAMS+=" --tls $TLS"
+    CLIENT_PARAMS+=" --tls $TLS"
+fi
 
 if [ "$TEST_TYPE" == "MEASUREMENT" ] && [ -x "$(command -v s2n-quic-qns-release)" ]; then
     echo "using optimized build"

diff --git a/scripts/perf/bin/s2n-quic b/scripts/perf/bin/s2n-quic
@@ -12,8 +12,7 @@ case "$PS" in
           ../../target/release/s2n-quic-qns \
             perf \
             server \
-            --port $SERVER_PORT \
-            --tls "${TLS}"
+            --port $SERVER_PORT
         ;;
     client*)
           ../../target/release/s2n-quic-qns \
@@ -22,7 +21,6 @@ case "$PS" in
             --download-size "${DOWNLOAD_BYTES}b" \
             --upload-size "${UPLOAD_BYTES}b" \
             --duration "${DURATION}s" \
-            --tls "${TLS}" \
             --port $SERVER_PORT \
             --hostname localhost
         ;;

diff --git a/scripts/perf/test b/scripts/perf/test
@@ -11,7 +11,6 @@ DOWNLOAD_MB=${1:-1000}
 UPLOAD_MB=${2:-0}
 SERVER=${3:-s2n-quic}
 CLIENT=${4:-quinn}
-TLS=${5:-s2n-tls}
 DURATION=${6-10}
 
 TEST="${DOWNLOAD_MB}MB-down-${UPLOAD_MB}MB-up"
@@ -28,7 +27,6 @@ SERVER=$SERVER \
   CLIENT=$CLIENT \
   DOWNLOAD_BYTES=$DOWNLOAD_BYTES \
   UPLOAD_BYTES=$UPLOAD_BYTES \
-  TLS=$TLS \
   DURATION=$DURATION \
   SERVER_PORT=4433 \
   TMP_DIR=$TMP_DIR \