Skip to content

Commit 7670bb5

Browse files
authored
Fix rustls integ tests (#807)
1 parent 5b0febb commit 7670bb5

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

aws-lc-rs/scripts/run-rustls-integration.sh

+10-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ done
1414
CLEANUP_ON_EXIT=()
1515

1616
function cleanup() {
17-
for x in ${CLEANUP_ON_EXIT[@]}; do
17+
for x in "${CLEANUP_ON_EXIT[@]}"; do
1818
rm -rf "${x}"
1919
done
2020
}
@@ -44,20 +44,26 @@ popd &>/dev/null # "${ROOT}/aws-lc-rs"
4444

4545
RUSTLS_RCGEN_DIR="$(mktemp -d)"
4646
CLEANUP_ON_EXIT+=("${RUSTLS_RCGEN_DIR}")
47-
cargo download rcgen | tar xvzf - -C "${RUSTLS_RCGEN_DIR}" --strip-components=1
47+
cargo download -o "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz rcgen
48+
tar xvzf "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz -C "${RUSTLS_RCGEN_DIR}" --strip-components=1
49+
rm "${RUSTLS_RCGEN_DIR}"/rcgen.tar.gz
4850
RUSTLS_RCGEN_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_RCGEN_DIR}/.cargo_vcs_info.json)"
4951
rm -rf "${RUSTLS_RCGEN_DIR}" # Cleanup before we clone
5052

5153
RUSTLS_WEBPKI_DIR="$(mktemp -d)"
5254
CLEANUP_ON_EXIT+=("${RUSTLS_WEBPKI_DIR}")
53-
cargo download rustls-webpki | tar xvzf - -C "${RUSTLS_WEBPKI_DIR}" --strip-components=1
55+
cargo download -o "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz rustls-webpki
56+
tar xvzf "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz -C "${RUSTLS_WEBPKI_DIR}" --strip-components=1
57+
rm "${RUSTLS_WEBPKI_DIR}"/rustls-webpki.tar.gz
5458
RUSTLS_WEBPKI_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_WEBPKI_DIR}/.cargo_vcs_info.json)"
5559
rm -rf "${RUSTLS_WEBPKI_DIR}" # Cleanup before we clone
5660

5761
RUSTLS_DIR="$(mktemp -d)"
5862
CLEANUP_ON_EXIT+=("${RUSTLS_DIR}")
5963
if [[ $latest_release == "1" ]]; then
60-
cargo download rustls | tar xvzf - -C "${RUSTLS_DIR}" --strip-components=1
64+
cargo download -o "${RUSTLS_DIR}"/rustls.tar.gz rustls
65+
tar xvzf "${RUSTLS_DIR}"/rustls.tar.gz -C "${RUSTLS_DIR}" --strip-components=1
66+
rm "${RUSTLS_DIR}"/rustls.tar.gz
6167
RUSTLS_COMMIT="$(jq -r '.git.sha1' ${RUSTLS_DIR}/.cargo_vcs_info.json)"
6268
rm -rf "${RUSTLS_DIR}" # Cleanup before we clone
6369
fi

0 commit comments

Comments
 (0)