mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 14:50:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test-libarchive-3.8.2' into update-libarchive

Browse Source
This commit is contained in:
Brad King
2025-11-10 15:11:31 -05:00
parent 59534983c9 576117b7eb
commit 5c1ec64d20
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/RunCMake/CommandLineTar/pax-zstd.cmake
View File

@@ -7,4 +7,5 @@ set(DECOMPRESSION_FLAGS xvf)
include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake)
check_magic("28b52ffd0058" LIMIT 6 HEX)
# libarchive 3.8.2 enables a checksum feature; older versions do not.
check_magic("^28b52ffd0[04]58$" LIMIT 6 HEX)

4
Tests/RunCMake/CommandLineTar/roundtrip.cmake
View File

@@ -86,6 +86,10 @@ function(check_magic EXPECTED)
${ARGN}
)
if(EXPECTED MATCHES "[^0-9a-f]" AND ACTUAL MATCHES "${EXPECTED}")
return()
endif()
if(NOT ACTUAL STREQUAL EXPECTED)
message(FATAL_ERROR
"Actual [${ACTUAL}] does not match expected [${EXPECTED}]")

3
Tests/RunCMake/File_Archive/pax-zstd.cmake
View File

@@ -5,4 +5,5 @@ set(COMPRESSION_TYPE Zstd)
include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake)
check_magic("28b52ffd0058" LIMIT 6 HEX)
# libarchive 3.8.2 enables a checksum feature; older versions do not.
check_magic("^28b52ffd0[04]58$" LIMIT 6 HEX)

4
Tests/RunCMake/File_Archive/roundtrip.cmake
View File

@@ -86,6 +86,10 @@ function(check_magic EXPECTED)
${ARGN}
)
if(EXPECTED MATCHES "[^0-9a-f]" AND ACTUAL MATCHES "${EXPECTED}")
return()
endif()
if(NOT ACTUAL STREQUAL EXPECTED)
message(FATAL_ERROR
"Actual [${ACTUAL}] does not match expected [${EXPECTED}]")