From b0469406796ee4616047224b62c0b4d73455749d Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Thu, 10 Aug 2023 15:45:19 -0600 Subject: [PATCH] CMake: Download Commonmark and Wasm spec tests using download_file() This makes sure we have no bare file(DOWNLOAD) calls in the build --- Meta/CMake/commonmark_spec.cmake | 2 +- Meta/CMake/wasm_spec_tests.cmake | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Meta/CMake/commonmark_spec.cmake b/Meta/CMake/commonmark_spec.cmake index b6ccd1f565..0af6a38624 100644 --- a/Meta/CMake/commonmark_spec.cmake +++ b/Meta/CMake/commonmark_spec.cmake @@ -4,6 +4,6 @@ set(MARKDOWN_TEST_PATH ${CMAKE_BINARY_DIR}/commonmark.spec.json) set(MARKDOWN_TEST_URL https://spec.commonmark.org/0.30/spec.json) if(ENABLE_COMMONMARK_SPEC_DOWNLOAD) - file(DOWNLOAD ${MARKDOWN_TEST_URL} ${MARKDOWN_TEST_PATH}) + download_file(${MARKDOWN_TEST_URL} ${MARKDOWN_TEST_PATH}) install(FILES ${MARKDOWN_TEST_PATH} DESTINATION home/anon/Tests) endif() diff --git a/Meta/CMake/wasm_spec_tests.cmake b/Meta/CMake/wasm_spec_tests.cmake index b82e6b94c1..1a4bf480b6 100644 --- a/Meta/CMake/wasm_spec_tests.cmake +++ b/Meta/CMake/wasm_spec_tests.cmake @@ -7,10 +7,7 @@ if(INCLUDE_WASM_SPEC_TESTS) set(WASM_SPEC_TEST_GZ_PATH ${CMAKE_BINARY_DIR}/wasm-spec-testsuite.tar.gz CACHE PATH "") set(WASM_SPEC_TEST_PATH ${CMAKE_CURRENT_BINARY_DIR}/Tests/Fixtures/SpecTests CACHE PATH "") - if(NOT EXISTS ${WASM_SPEC_TEST_GZ_PATH}) - message(STATUS "Downloading the WebAssembly testsuite from ${WASM_SPEC_TEST_GZ_URL}...") - file(DOWNLOAD ${WASM_SPEC_TEST_GZ_URL} ${WASM_SPEC_TEST_GZ_PATH} INACTIVITY_TIMEOUT 10) - endif() + download_file(${WASM_SPEC_TEST_GZ_URL} ${WASM_SPEC_TEST_GZ_PATH}) set(SKIP_PRETTIER false) if (WASM_SPEC_TEST_SKIP_FORMATTING)