From 904a4dd314f81a9fa846809aa8cc409eb7135364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kleines=20Filmr=C3=B6llchen?= Date: Mon, 9 Jan 2023 23:52:22 +0100 Subject: [PATCH] Meta: Use extract_tar_path for WASM spec test generation --- Meta/CMake/wasm_spec_tests.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Meta/CMake/wasm_spec_tests.cmake b/Meta/CMake/wasm_spec_tests.cmake index 0f75f2376a..b82e6b94c1 100644 --- a/Meta/CMake/wasm_spec_tests.cmake +++ b/Meta/CMake/wasm_spec_tests.cmake @@ -25,12 +25,8 @@ if(INCLUDE_WASM_SPEC_TESTS) if(EXISTS ${WASM_SPEC_TEST_GZ_PATH} AND NOT EXISTS ${WASM_SPEC_TEST_PATH}/const_0.wasm) message(STATUS "Extracting the WebAssembly testsuite from ${WASM_SPEC_TEST_GZ_PATH}...") + extract_tar_path("${CMAKE_CURRENT_BINARY_DIR}" "${WASM_SPEC_TEST_GZ_PATH}" "testsuite-main/*.wast" "${WASM_SPEC_TEST_PATH}") file(MAKE_DIRECTORY ${WASM_SPEC_TEST_PATH}) - if (CMAKE_VERSION VERSION_LESS 3.18.0) - execute_process(COMMAND "${TAR_TOOL}" -xzf ${WASM_SPEC_TEST_GZ_PATH}) - else() - file(ARCHIVE_EXTRACT INPUT ${WASM_SPEC_TEST_GZ_PATH} ) - endif() file(GLOB WASM_TESTS "${CMAKE_CURRENT_BINARY_DIR}/testsuite-main/*.wast") foreach(PATH ${WASM_TESTS}) get_filename_component(NAME ${PATH} NAME_WLE)