Skip to content

Commit 0d15e0d

Browse files
authored
test: try to fix intermittent test failures
1 parent c3bb64a commit 0d15e0d

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

test/cpp/integration-tests.bats

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -273,21 +273,7 @@ function get_expected_semver_for() {
273273
}
274274

275275
function install_win_sdk() {
276-
# Installing the Windows SDK/CRT takes a long time.
277-
# When still valid, use the installation from cache.
278-
279-
xwin --accept-license --manifest-version 16 --cache-dir ${BATS_TEST_DIRNAME}/.xwin-hash list
280-
local HASH_LIST_MANIFEST=$(sha256sum ${BATS_TEST_DIRNAME}/.xwin-hash/dl/manifest*.json | awk '{ print $1 }')
281-
local HASH_CACHED_MANIFEST=
282-
283-
if [[ -d ${BATS_TEST_DIRNAME}/.xwin-cache/dl ]]; then
284-
HASH_CACHED_MANIFEST=$(sha256sum ${BATS_TEST_DIRNAME}/.xwin-cache/dl/manifest*.json | awk '{ print $1 }')
285-
fi
286-
287-
if [[ $HASH_LIST_MANIFEST != $HASH_CACHED_MANIFEST ]]; then
288-
xwin --accept-license --manifest-version 16 --cache-dir ${BATS_TEST_DIRNAME}/.xwin-cache splat --preserve-ms-arch-notation
289-
fi
290-
276+
xwin --http-retry 2 --accept-license --manifest-version 16 --cache-dir ${BATS_TEST_DIRNAME}/.xwin-cache splat --preserve-ms-arch-notation
291277
ln -sf ${BATS_TEST_DIRNAME}/.xwin-cache/splat/ /winsdk
292278
}
293279

0 commit comments

Comments
 (0)