From a9bc0381454b5a6aed448ab3451e5c503a821895 Mon Sep 17 00:00:00 2001 From: Justin W Smith <103147162+justsmth@users.noreply.github.com> Date: Thu, 2 May 2024 14:28:52 -0400 Subject: [PATCH] Update s2n-quic integration test (#395) --- aws-lc-rs/scripts/run-s2n-quic-integration.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/aws-lc-rs/scripts/run-s2n-quic-integration.sh b/aws-lc-rs/scripts/run-s2n-quic-integration.sh index 6affdbf5e78..537c11af159 100755 --- a/aws-lc-rs/scripts/run-s2n-quic-integration.sh +++ b/aws-lc-rs/scripts/run-s2n-quic-integration.sh @@ -2,19 +2,16 @@ # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 OR ISC -ROOT=$PWD -QUIC_RING_STRING="^ring = { .* optional .* }" -QUIC_OUR_STRING="ring = { path = \"${PWD}\", optional = true, package = \"aws-lc-rs\"}" -QUIC_CRYPTO_RING_STRING="^ring = { .* }" -QUIC_CRYPTO_OUR_STRING="ring = { path = \"${PWD}\", package = \"aws-lc-rs\"}" +QUIC_AWS_LC_RS_STRING="^aws-lc-rs = { .* }" +QUIC_PATH_STRING="aws-lc-rs = { path = \"${PWD}\" }" git clone https://github.com/aws/s2n-quic.git cd s2n-quic # replace instances of ring with our crate if [[ "$(uname)" == "Darwin" ]]; then - find ./ -type f -name "Cargo.toml" | xargs sed -i '' -e "s|${QUIC_RING_STRING}|${QUIC_OUR_STRING}|g" -e "s|${QUIC_CRYPTO_RING_STRING}|${QUIC_CRYPTO_OUR_STRING}|g" + find ./ -type f -name "Cargo.toml" | xargs sed -i '' -e "s|${QUIC_AWS_LC_RS_STRING}|${QUIC_PATH_STRING}|" else - find ./ -type f -name "Cargo.toml" | xargs sed -i -e "s|${QUIC_RING_STRING}|${QUIC_OUR_STRING}|g" -e "s|${QUIC_CRYPTO_RING_STRING}|${QUIC_CRYPTO_OUR_STRING}|g" + find ./ -type f -name "Cargo.toml" | xargs sed -i -e "s|${QUIC_AWS_LC_RS_STRING}|${QUIC_PATH_STRING}|" fi cargo test